aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/virtuals
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-11-03 21:21:36 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-11-03 21:21:36 +0000
commita3da76a7780eb98017b185127693962316fd12ac (patch)
tree0dd3b22916f2868705032e71a47c8a0547d54a9b /paludis/repositories/virtuals
parent262df8c46ae1fee336bfa93f1381adf8d9387f7a (diff)
downloadpaludis-a3da76a7780eb98017b185127693962316fd12ac.tar.gz
paludis-a3da76a7780eb98017b185127693962316fd12ac.tar.xz
Make parallel tests betterer
Diffstat (limited to 'paludis/repositories/virtuals')
-rw-r--r--paludis/repositories/virtuals/Makefile.am25
1 files changed, 1 insertions, 24 deletions
diff --git a/paludis/repositories/virtuals/Makefile.am b/paludis/repositories/virtuals/Makefile.am
index f9007f27a..3afc3c21a 100644
--- a/paludis/repositories/virtuals/Makefile.am
+++ b/paludis/repositories/virtuals/Makefile.am
@@ -1,8 +1,4 @@
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-DISTCLEANFILES =
-MAINTAINERCLEANFILES = Makefile.in
-
-AUTOMAKE_OPTIONS = parallel-tests
+include $(top_srcdir)/misc/common-makefile.am
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -34,22 +30,6 @@ check_SCRIPTS =
EXTRA_DIST = $(virtuals_repository_TEST_SOURCES) $(installed_virtuals_repository_TEST_SOURCES)
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/`:` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
- bash $(top_srcdir)/test/run_test.sh
-
virtuals_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
@@ -72,6 +52,3 @@ virtuals_repository_TEST_SOURCES = \
installed_virtuals_repository_TEST_SOURCES = \
installed_virtuals_repository_TEST.cc
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-