diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-06-13 20:31:46 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-06-14 22:35:02 +0200 |
| commit | 44530f2ddd97e02728520cca9cb0ba2bada750d1 (patch) | |
| tree | da2427f02628310a657af43856effbdbbd4c893a | |
| parent | 9823682c2f339886cb302dfc4ed4c5d75e911d3e (diff) | |
| download | coreutils-44530f2ddd97e02728520cca9cb0ba2bada750d1.tar.xz | |
run gnulib-tests in parallel
* tests/Makefile.am: Define AUTOMAKE_OPTIONS, so check.mk can append.
* tests/check.mk: Define SUFFIXES, so check.mk can append.
* build-aux/check.mk (SUFFIXES): Append, so as not to evoke
automake warning the prior definition in gnulib-tests/gnulib.mk.
(AUTOMAKE_OPTIONS): Likewise.
* gnulib-tests/Makefile.am (TEST_LOGS): Define.
Include build-aux/check.mk
| -rw-r--r-- | build-aux/check.mk | 4 | ||||
| -rw-r--r-- | gnulib-tests/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/check.mk | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/build-aux/check.mk b/build-aux/check.mk index 165ea366b..f26696d4b 100644 --- a/build-aux/check.mk +++ b/build-aux/check.mk @@ -41,7 +41,7 @@ ENABLE_HARD_ERRORS = : ## We use GNU Make extensions (%-rules) inside GNU_MAKE checks, ## and we override check-TESTS. -AUTOMAKE_OPTIONS = -Wno-portability -Wno-override +AUTOMAKE_OPTIONS += -Wno-portability -Wno-override # Restructured Text title and section. am__rst_title = sed 's/.*/ & /;h;s/./=/g;p;x;p;g;p;s/.*//' @@ -145,7 +145,7 @@ echo "$$res: $@ (exit: $$estatus)" | \ cat $@-t >>$@; \ rm $@-t -SUFFIXES = .html .log +SUFFIXES += .html .log # From a test (with no extension) to a log file. if GNU_MAKE diff --git a/gnulib-tests/Makefile.am b/gnulib-tests/Makefile.am index 6635f7065..7523e0db8 100644 --- a/gnulib-tests/Makefile.am +++ b/gnulib-tests/Makefile.am @@ -1 +1,6 @@ include gnulib.mk + +TEST_LOGS = $(TESTS:=.log) + +# Parallel replacement of Automake's check-TESTS target. +include $(top_srcdir)/build-aux/check.mk diff --git a/tests/Makefile.am b/tests/Makefile.am index 91db7bcdb..9b6a37819 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -564,4 +564,5 @@ pr_data = \ pr/ttb3-FF \ pr/w72l24f-ll +AUTOMAKE_OPTIONS = include $(srcdir)/check.mk diff --git a/tests/check.mk b/tests/check.mk index 0e34e98de..3ac5e4221 100644 --- a/tests/check.mk +++ b/tests/check.mk @@ -91,6 +91,7 @@ TESTS_ENVIRONMENT = \ TEST_LOGS = $(TESTS:=.log) # Parallel replacement of Automake's check-TESTS target. +SUFFIXES = include $(top_srcdir)/build-aux/check.mk VERBOSE = yes |