Commit 173e719c authored by Kaiyuan Hou's avatar Kaiyuan Hou
Browse files

use Makefile.subdir in place of recursive make

parent 4cee3b82
......@@ -27,16 +27,19 @@ noinst_HEADERS = include/io_stats.h \
include/file_stats.h \
include/lustre-utils.h
SUBDIRS = tests
#tests_simple_SOURCES = tests/simple.c
#tests_strided_SOURCES = tests/strided.c
# hack/trick to force linking with C++
# but all symbols are extern C so it should not be needed
#nodist_EXTRA_tests_simple_SOURCES = dummy.cc
#tests_simple_LDADD = lib/libmochio-client.la
#tests_strided_LDADD = lib/libmochio-client.la
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = maint/mochio-provider.pc \
maint/mochio-client.pc
SUFFIXES=
LDADD=
check_PROGRAMS=
EXTRA_DIST=
CLEANFILES=
TESTS=
include $(top_srcdir)/tests/Makefile.subdir
# build check targets but not invoke
tests: all $(check_PROGRAMS)
......@@ -66,7 +66,5 @@ AC_CHECK_HEADERS([lustre/lustreapi.h])
# checks for library functions
AM_EXTRA_RECURSIVE_TARGETS([tests])
AC_CONFIG_FILES([Makefile tests/Makefile maint/mochio-client.pc maint/mochio-provider.pc])
AC_CONFIG_FILES([Makefile maint/mochio-client.pc maint/mochio-provider.pc])
AC_OUTPUT
#
# Copyright (C) 2019, Northwestern University and Argonne National Laboratory
# See COPYRIGHT notice in top-level directory.
#
# $Id$
#
# @configure_input@
SUFFIXES = .o .c .f
AM_DEFAULT_SOURCE_EXT = .c
AM_CPPFLAGS = -I$(top_srcdir)/include
LDADD = $(top_srcdir)/lib/libmochio-client.la
check_PROGRAMS = simple \
strided \
null \
overlap
EXTRA_DIST = # wrap_runs.sh parallel_run.sh
OUT_FILES = $(check_PROGRAMS:%=%.bin)
SERVER_FILES = $(check_PROGRAMS:%=%.svc)
CLEANFILES = $(OUT_FILES) core core.* \
$(SERVER_FILES)
TESTPROGRAMS = $(check_PROGRAMS)
TESTS_ENVIRONMENT = export SED="$(SED)";
TESTS_ENVIRONMENT += export top_srcdir="$(top_srcdir)";
TESTS_ENVIRONMENT += export srcdir="$(srcdir)";
TESTS_ENVIRONMENT += export TESTOUTDIR="$(TESTOUTDIR)";
TESTS_ENVIRONMENT += export TESTPROGRAMS="$(TESTPROGRAMS)";
TESTS_ENVIRONMENT += export check_PROGRAMS="$(check_PROGRAMS)";
TEST_EXTENSIONS = .sh
LOG_COMPILER = $(srcdir)/wrap_runs.sh
SH_LOG_COMPILER =
TESTS = $(TESTPROGRAMS)
# build check targets but not invoke
tests-local: all $(check_PROGRAMS)
.PHONY: ptest ptests ptest2 ptest4 ptest6 ptest8 ptest10
#
# Copyright (C) 2019, Northwestern University and Argonne National Laboratory
# See COPYRIGHT notice in top-level directory.
#
# $Id$
#
# @configure_input@
SUFFIXES += .o .c .cpp
AM_DEFAULT_SOURCE_EXT = .c
AM_CPPFLAGS += -I$(top_srcdir)/include
LDADD += $(top_srcdir)/lib/libmochio-client.la
TESTPROGRAMS = tests/simple \
tests/strided \
tests/null \
tests/overlap
check_PROGRAMS += ${TESTPROGRAMS}
EXTRA_DIST += tests/wrap_runs.sh
OUT_FILES = $(check_PROGRAMS:%=%.bin)
SERVER_FILES = $(check_PROGRAMS:%=%.svc)
CLEANFILES += $(OUT_FILES) tests/core tests/core.* \
$(SERVER_FILES)
LOG_COMPILER = tests/wrap_runs.sh
TESTS += ${TESTPROGRAMS}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment