diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-20 21:04:36 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-23 10:01:05 +0200 |
commit | 53b45c7187a1031f9c07cbd93e6e0a8c90e579bd (patch) | |
tree | 61c280b9bf0dd89c82aefe33d3935ed91edc1190 /t/test-driver-strip-vpath.sh | |
parent | e4412726eb36809bd21b3bb308b2f791e4154e43 (diff) | |
download | automake-53b45c7187a1031f9c07cbd93e6e0a8c90e579bd.tar.gz |
[ng] parallel-tests: simplify automake-time preprocessing
Our new pattern rules, introduced in recent commit 'v1.11b-124-gaeaba3f',
are smart enough to allow us to ditch most of our cumbersome automake-time
analysis and rewriting of the $(TESTS) variable when the parallel-tests
driver is used. This also makes other related simplifications possible.
This change causes a little regression in that we won't be able anymore to
diagnose at automake time test cases that start with the '$(srcdir)' or
'$(top_srcdir)' component, but that's acceptable, since a later commit will
make the former case actually work, and the second case isn't important
enough to worry to much about.
This change also causes a small behavioural change in automake, in that it
will also need the 'LOG_DRIVER' variable to be defined in each Makefile.am
defining the 'TESTS' variable; and if it's not defined, automake will
define it itself, and require the presence of the 'test-driver' auxiliary
script in the process (or bing it in if the "--add-missing" option is in
use). See the changes to 'NG-NEWS' for more details, and for workarounds.
* automake.in (handle_tests): Don't walk nor rewrite $(TESTS) when the
'parallel-tests' option is active. Other related minor simplifications.
* t/exeext4.sh: Define '$am_parallel_tests' to "no", so that the test
won't be run with the 'parallel-tests' option enabled (as the semantics
in that case have been changed in a way that would make this test fail).
* t/check7.sh: When '$am_parallel_tests' is "yes", skip checks that
don't work anymore with the 'parallel-tests' option is enabled.
* t/test-driver-custom-no-extra-driver.sh: Adjust to avoid spurious
failures to to the "LOG_DRIVER must be defined somehow" semantic change.
* t/tap-common-setup.sh: Likewise.
* t/tap-recheck.sh: Likewise.
* t/tap-basic.sh: Likewise.
* t/tap-diagnostic-custom.sh: Likewise.
* t/tap-more.sh: Likewise.
* t/tap-recheck.sh: Likewise.
* t/tap-signal.tap: Likewise.
* t/test-driver-custom-multitest.sh: Likewise.
* t/test-driver-custom-multitest-recheck.sh: Likewise.
* t/test-driver-custom-multitest-recheck2.sh: Likewise.
* t/test-driver-custom-xfail-tests.sh: Likewise.
* t/test-driver-fail.sh: Likewise.
* t/test-driver-strip-vpath.sh: Likewise.
* t/test-metadata-global-log.sh: Likewise.
* t/test-metadata-global-results.sh: Likewise, and enhanced a little since
we are at it.
* t/test-metadata-results.sh: Likewise.
* t/tap-bad-prog.tap: Likewise.
* t/parallel-tests8.sh: Move the now-failing checks verifying that automake
diagnoses test cases that start with the '$(srcdir)' or '$(top_srcdir)'...
* t/parallel-tests-srcdir-in-test-name.sh: ... this new xfailing test.
* t/spy-pattern-rules.sh: New "spy" test, verify our new assumptions on the
precedence of pattern rules truly hold.
* t/parallel-tests-longest-stem.sh: New test.
* t/list-of-tests.mk: Update.
* doc/automake.texi: Document that $(TESTS) is rewritten for $(EXEEXT)
appending only when the 'parallel-tests' option is *not* in use.
Add a "FIXME" comment about the fact that automake does not diagnose test
cases that start with the '$(srcdir)' or '$(top_srcdir)' anymore.
* NG-NEWS: Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/test-driver-strip-vpath.sh')
-rwxr-xr-x | t/test-driver-strip-vpath.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/t/test-driver-strip-vpath.sh b/t/test-driver-strip-vpath.sh index 967018854..f7adb674c 100755 --- a/t/test-driver-strip-vpath.sh +++ b/t/test-driver-strip-vpath.sh @@ -39,9 +39,10 @@ cat > Makefile.am << 'END' # The $(empty) are for eliciting VPATH rewrites on make implementations # that support it (e.g., Solaris make), to improve coverage. empty = -TESTS = $(empty) foo.test src/bar.test ./src/baz.test $(empty) +TESTS = $(empty) foo.test src/bar.test ./src/baz $(empty) $(TESTS): -TEST_LOG_DRIVER = $(srcdir)/checkstrip-driver +LOG_DRIVER = $(srcdir)/checkstrip-driver +TEST_LOG_DRIVER = $(LOG_DRIVER) EXTRA_DIST = checkstrip-driver END @@ -61,8 +62,10 @@ while test $# -gt 0; do done echo "test name: $test_name" # For debugging. case $test_name in - foo.test|./foo.test|src/ba[rz].test|./src/ba[rz].test);; - *) exit 1;; + foo.test|./foo.test) ;; + src/bar.test|./src/bar.test) ;; + src/baz|./src/baz) ;; + *) exit 1 ;; esac echo dummy > "$log_file" echo dummy > "$trs_file" |