aboutsummaryrefslogtreecommitdiff
path: root/hooks
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 /hooks
parent262df8c46ae1fee336bfa93f1381adf8d9387f7a (diff)
downloadpaludis-a3da76a7780eb98017b185127693962316fd12ac.tar.gz
paludis-a3da76a7780eb98017b185127693962316fd12ac.tar.xz
Make parallel tests betterer
Diffstat (limited to 'hooks')
-rw-r--r--hooks/Makefile.am.m433
1 files changed, 4 insertions, 29 deletions
diff --git a/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4
index 708241316..4868e421f 100644
--- a/hooks/Makefile.am.m4
+++ b/hooks/Makefile.am.m4
@@ -3,11 +3,11 @@ ifdef(`__gnu__',`',`errprint(`This is not GNU m4...
dnl vim: set ft=m4 noet :
-MAINTAINERCLEANFILES = Makefile.in Makefile.am
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT .keep *.epicfail
-SUBDIRS = . demos
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+CLEANFILES += .keep
+MAINTAINERCLEANFILES += Makefile.am
+SUBDIRS = . demos
installvarlibpaludisnewsdir = $(localstatedir)/gentoo/news
@@ -272,31 +272,6 @@ uninstall-local :
Makefile.am : Makefile.am.m4
$(top_srcdir)/misc/do_m4.bash Makefile.am
-changequote(`<', `>')
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
-TESTS_ENVIRONMENT = env \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PATH="${PATH}:/sbin:/usr/sbin" \
- PALUDIS_COMMAND="$(top_builddir)/src/clients/paludis/paludis" \
- PALUDIS_HOOKER_DIR="$(top_srcdir)/paludis/" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_ECHO_FUNCTIONS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EBUILD_DIR="$(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_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- 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/`" \
- TOP_SRCDIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)`" \
- TOP_BUILDDIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)`" \
- bash $(top_srcdir)/hooks/run_test.bash
-
all-local :
chmod +x $(builddir)/news.hook $(builddir)/eselect_env_update.bash