summaryrefslogtreecommitdiff
path: root/lib/am/check2.am
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-05-20 21:45:51 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2011-06-21 22:27:25 +0200
commit79922343073c66c3f8d4692efb1f31fe47c16fa9 (patch)
treecdbc20367f78e483625a9ac526174a2f54e974fe /lib/am/check2.am
parenta27c9c4956fd1643cc3a0b3a553ce40039867680 (diff)
downloadautomake-79922343073c66c3f8d4692efb1f31fe47c16fa9.tar.gz
parallel-tests: allow custom driver scripts
Allow suffix-based definition of custom "driver script" for the test scripts. These driver scripts will be responsible of launching the tests (or their corresponding $(LOG_COMPILER), if they have an associated one), interpreting and displaying the test results, and writing the `.log' files. This new API should allow easy and flexible use of different test protocols in the future; in particular, we plan to use it to implement TAP and SubUnit harnesses. Note that no new documentation is added by this change; that is be left for follow-up changes. * automake.in (handle_tests): Define default for $(LOG_DRIVER), and, for any registered test extension `<ext>', define defaults for $(<ext>_LOG_DRIVER). Substitute %DRIVER% using these new variables, instead of the old internal $(am__test_driver). When processing check2.am, also substitute %DRIVER_FLAGS%. Require auxiliary script `test-driver' only if no driver has been explicitly defined for the test script kinds. * am/check2.am (?GENERIC?%EXT%$(EXEEXT).log, ?GENERIC?%EXT%.log, ?!GENERIC?%OBJ%): Pass the %DRIVER_FLAGS% to the %DRIVER% call. * tests/parallel-tests-no-extra-driver.test: New test. * tests/test-driver-custom.test: Likewise. * tests/test-driver-custom-xfail-tests.test: Likewise. * tests/test-driver-fail.test: Likewise. * tests/Makefile.am: Update. * NEWS: Update.
Diffstat (limited to 'lib/am/check2.am')
-rw-r--r--lib/am/check2.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/am/check2.am b/lib/am/check2.am
index f3116c8d1..b7ed0eeaa 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -18,7 +18,7 @@
?GENERIC?%EXT%.log:
?!GENERIC?%OBJ%: %SOURCE%
@p='%SOURCE%'; $(am__check_pre) \
- %DRIVER% $(am__test_driver_flags) -- \
+ %DRIVER% $(am__test_driver_flags) %DRIVER_FLAGS% -- \
%COMPILE% "$$tst"
## If no programs are built in this package, then this rule is removed
@@ -28,6 +28,6 @@
if %am__EXEEXT%
?GENERIC?%EXT%$(EXEEXT).log:
@p='%SOURCE%'; $(am__check_pre) \
- %DRIVER% $(am__test_driver_flags) -- \
+ %DRIVER% $(am__test_driver_flags) %DRIVER_FLAGS% -- \
%COMPILE% "$$tst"
endif %am__EXEEXT%