diff options
Diffstat (limited to 'gen-testsuite-part')
| -rwxr-xr-x | gen-testsuite-part | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/gen-testsuite-part b/gen-testsuite-part index a2db2d30b..34e10a83d 100755 --- a/gen-testsuite-part +++ b/gen-testsuite-part @@ -191,30 +191,19 @@ my %deps_extractor = my %test_generators = ( # - # For each test script in the Automake testsuite that itself tests - # features of the TESTS automake interface, define a sibling test - # that does likewise, but with the option 'parallel-tests' enabled. + # Any test script in the Automake testsuite that checks features of + # the Automake-provided parallel testsuite harness might want to + # define a sibling test that does similar checks, but for the old + # serial testsuite harness instead. # - # A test is considered a candidate for sibling-generation if any - # Makefile.am generated by it define the TESTS variable. + # Individual tests can request the creation of such a sibling by + # making the string "try-with-serial-tests" appear any line of the + # test itself. # - # Individual tests can prevent the creation of such a sibling by - # explicitly setting the '$am_parallel_tests' variable to either "yes" - # or "no". The rationale for this is that if the variable is set to - # "yes", the test already uses the 'parallel-tests' option, so that - # a sibling would be just a duplicate; while if the variable is set - # to "no", the test doesn't support, or is not meant to run with, the - # 'parallel-tests' option, and forcing it to do so in the sibling - # would likely cause a spurious failure. - # - parallel_testsuite_harness => + serial_testsuite_harness => { - line_matcher => - qr/(?:^|\s)TESTS\s*=/, - line_rejecter => - qr/(?:^[^#]*\bparallel-tests\b)|\bam_parallel_tests=/, - shell_setup_code => - 'am_parallel_tests=yes' + line_matcher => qr/\btry-with-serial-tests\b/, + shell_setup_code => 'am_serial_tests=yes', }, # # For each test script in the Automake testsuite that tests features @@ -287,7 +276,7 @@ while (my ($k, $g) = each %test_generators) { my @wrapped_tests = grep { line_match ($g->{line_matcher}, $_) - && !line_match ($g->{line_rejecter}, $_) + && (!$g->{line_rejecter} || !line_match ($g->{line_rejecter}, $_)) } @all_tests; foreach my $wrapped_test (@wrapped_tests) { |