diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-16 18:35:50 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-16 18:35:50 +0100 |
| commit | 3d6197fe647445ecbcfaac6c004449246471d5b6 (patch) | |
| tree | 5adf87662b33a7df7c6dcaad4b5c5930e4c7c6a2 /automake.in | |
| parent | 12dc0ec5e3c7e1a12569d5cfdbb8ceaa5a5f5f58 (diff) | |
| parent | 8fec2399264ee4822ecf2c0d9275d890edbc8e50 (diff) | |
| download | automake-3d6197fe647445ecbcfaac6c004449246471d5b6.tar.gz | |
Merge branch 'check-html-deprecate' into maint
* check-html-deprecate:
recheck: fix interaction with "make -n"
recheck: behave better with non-GNU make
check: separate .log -> .html conversion from core testsuite harness
docs: deprecate .log -> .html conversion by parallel-tests
Diffstat (limited to 'automake.in')
| -rw-r--r-- | automake.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/automake.in b/automake.in index 50a9d8730..24d5872dd 100644 --- a/automake.in +++ b/automake.in @@ -4958,9 +4958,11 @@ sub handle_tests if (var ('TESTS')) { push (@check_tests, 'check-TESTS'); + my $check_deps = "@check"; $output_rules .= &file_contents ('check', new Automake::Location, COLOR => !! option 'color-tests', - PARALLEL_TESTS => !! option 'parallel-tests'); + PARALLEL_TESTS => !! option 'parallel-tests', + CHECK_DEPS => $check_deps); # Tests that are known programs should have $(EXEEXT) appended. # For matching purposes, we need to adjust XFAIL_TESTS as well. @@ -4971,7 +4973,6 @@ sub handle_tests if (option 'parallel-tests') { define_variable ('TEST_SUITE_LOG', 'test-suite.log', INTERNAL); - define_variable ('TEST_SUITE_HTML', '$(TEST_SUITE_LOG:.log=.html)', INTERNAL); my $suff = '.test'; my $at_exeext = ''; my $handle_exeext = exists $configure_vars{'EXEEXT'}; @@ -5087,7 +5088,6 @@ sub handle_tests $clean_files{'$(TEST_LOGS_TMP)'} = MOSTLY_CLEAN; $clean_files{'$(TEST_LOGS)'} = MOSTLY_CLEAN; $clean_files{'$(TEST_SUITE_LOG)'} = MOSTLY_CLEAN; - $clean_files{'$(TEST_SUITE_HTML)'} = MOSTLY_CLEAN; } } } |