aboutsummaryrefslogtreecommitdiff
path: root/test/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'test/Makefile.am')
-rw-r--r--test/Makefile.am16
1 files changed, 5 insertions, 11 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 2b14798db..a1137b790 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,10 +1,8 @@
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
EXTRA_DIST = run_test.sh
-AUTOMAKE_OPTIONS = parallel-tests
-
libtest_a_SOURCES = \
test_framework.cc \
test_framework.hh \
@@ -17,11 +15,10 @@ libtestnomain_a_SOURCES = \
test_framework.hh \
test_concepts.hh
-XFAIL_TESTS = test_fail_TEST
-TESTS = test_pass_TEST $(XFAIL_TESTS)
+my_XFAIL_TESTS = test_fail_TEST
+XFAIL_TESTS = $(my_XFAIL_TESTS)
+TESTS = test_pass_TEST $(my_XFAIL_TESTS)
-TESTS_ENVIRONMENT = env PALUDIS_OPTIONS="" \
- TEST_SCRIPT_DIR="$(srcdir)/" bash $(top_srcdir)/test/run_test.sh
check_LIBRARIES = libtest.a libtestnomain.a
check_PROGRAMS = $(TESTS) $(XFAIL_TESTS)
check_SCRIPTS = run_test.sh
@@ -34,6 +31,3 @@ test_fail_TEST_SOURCES = test_fail_TEST.cc
test_fail_TEST_LDADD = libtest.a
test_fail_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-built-sources : $(BUILT_SOURCES)
- for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-