diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-22 00:09:30 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-22 00:09:30 +0200 |
| commit | 4d56c0f3b5973e386c3e5f0fb2367d2fff00bf71 (patch) | |
| tree | f0a26a6c57a6018c9405ce3a22ab9eddad70309d /contrib/t | |
| parent | 60bfe0b9af62baae3498fe8688703570ecb1a93e (diff) | |
| parent | c7cfa09349bb588b71ea7adffa385034465b1b09 (diff) | |
| download | automake-4d56c0f3b5973e386c3e5f0fb2367d2fff00bf71.tar.gz | |
Merge branch 'micro' into maint
* micro:
tests: run_make: options to do command redirection
tests: only activate 'unset' alias if required
tests: better idiom to override make macro defs on the cmdline
test-lib: minor style changes
test-lib: fix botched function name in an error message
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'contrib/t')
| -rwxr-xr-x | contrib/t/parallel-tests-html.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/t/parallel-tests-html.sh b/contrib/t/parallel-tests-html.sh index d4951b110..209dda880 100755 --- a/contrib/t/parallel-tests-html.sh +++ b/contrib/t/parallel-tests-html.sh @@ -87,12 +87,12 @@ test ! -e bla # Always create the HTML output, even if there were no failures. rm -f mylog.html -env TESTS=foo.test $MAKE -e check-html +run_make TESTS=foo.test check-html test -f mylog.html # Create summarizing HTML output also with recheck-html. rm -f mylog.html -env TESTS=foo.test $MAKE -e recheck-html +run_make TESTS=foo.test recheck-html test -f mylog.html # Create HTML output for an individual test. @@ -120,7 +120,7 @@ test ! -e mylog.html $MAKE clean test ! -e mylog.html -env TEST_LOGS=foo.log $MAKE -e check-html +run_make TEST_LOGS=foo.log check-html test -f bla test -f foo.log test ! -e bar.log @@ -128,7 +128,7 @@ test ! -e baz.log test -f mylog.html $MAKE clean -env TESTS=foo.test $MAKE -e recheck-html +run_make TESTS=foo.test recheck-html test -f bla test ! -e foo.log test -f mylog.html |