diff options
202 files changed, 130 insertions, 267 deletions
diff --git a/Makefile.am b/Makefile.am index 1000764e8..baef18613 100644 --- a/Makefile.am +++ b/Makefile.am @@ -398,7 +398,7 @@ AM_TESTS_ENVIRONMENT = \ me \ required \ am_using_tap \ - am_parallel_tests \ + am_serial_tests \ am_test_prefer_config_shell \ am_original_AUTOMAKE \ am_original_ACLOCAL \ @@ -961,10 +961,10 @@ else # to append AC_OUTPUT. { echo "AC_INIT([$me], [1.0])" - if test x"$am_parallel_tests" = x"yes"; then - echo "AM_INIT_AUTOMAKE([parallel-tests])" - else + if test x"$am_serial_tests" = x"yes"; then echo "AM_INIT_AUTOMAKE" + else + echo "AM_INIT_AUTOMAKE([parallel-tests])" fi echo "AC_CONFIG_FILES([Makefile])" } >configure.ac || framework_failure_ "creating configure.ac skeleton" diff --git a/defs-static.in b/defs-static.in index 44db30953..1dfd8d3b8 100644 --- a/defs-static.in +++ b/defs-static.in @@ -73,7 +73,7 @@ for var in \ me \ required \ am_using_tap \ - am_parallel_tests \ + am_serial_tests \ am_create_testdir \ am_tap_implementation \ am_test_prefer_config_shell \ diff --git a/doc/automake-ng.texi b/doc/automake-ng.texi index 57442c0b9..eb4705c24 100644 --- a/doc/automake-ng.texi +++ b/doc/automake-ng.texi @@ -12866,7 +12866,7 @@ email to @email{@value{PACKAGE_BUGREPORT}}. Be sure to include the versions of Autoconf and Automake-NG that you use. Ideally, post a minimal @file{Makefile.am} and @file{configure.ac} that reproduces the problem you encounter. If you have encountered test -suite failures, please attach the @file{tests/test-suite.log} file. +suite failures, please attach the @file{test-suite.log} file. @c ========================================================== Appendices diff --git a/gen-testsuite-part b/gen-testsuite-part index d181b98f7..460ec6357 100755 --- a/gen-testsuite-part +++ b/gen-testsuite-part @@ -194,30 +194,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 @@ -289,7 +278,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) { diff --git a/syntax-checks.mk b/syntax-checks.mk index 9804378d0..ab9d2e0e6 100644 --- a/syntax-checks.mk +++ b/syntax-checks.mk @@ -372,10 +372,11 @@ sc_docs_no_make_e: sc_tests_obsolete_variables: @vars=" \ using_tap \ - parallel_tests \ test_prefer_config_shell \ original_AUTOMAKE \ original_ACLOCAL \ + parallel_tests \ + am_parallel_tests \ "; \ seen=""; \ for v in $$vars; do \ @@ -385,7 +386,11 @@ sc_tests_obsolete_variables: done; \ if test -n "$$seen"; then \ for v in $$seen; do \ - echo "Variable '$$v' is obsolete, use 'am_$$v' instead." 1>&2; \ + case $$v in \ + parallel_tests|am_parallel_tests) v2=am_serial_tests;; \ + *) v2=am_$$v;; \ + esac; \ + echo "Variable '$$v' is obsolete, use '$$v2' instead." 1>&2; \ done; \ exit 1; \ else :; fi @@ -172,11 +172,16 @@ Do set-up of a test scenario, you can use the 'framework_fail_' function instead. - For tests that use the 'parallel-tests' Automake-NG option, set the - shell variable 'am_parallel_tests' to "yes" before including ./defs. - For tests that are *not* meant to work with the 'parallel-tests' - Automake-NG option (these should be very very few), set the shell - variable 'am_parallel_tests' to "no" before including ./defs. + For those tests checking the Automake-provided test harnesses that are + expected to work also when the 'serial-tests' Automake option is used + (thus causing the serial testsuite harness to be used in the generated + Makefile), place a line containing "try-with-serial-tests" somewhere + in the file. That will ensure that the 'gen-testsuite-part' script + generates a sibling of that test which uses the serial harness instead + of the parallel one. For those tests that are *not* meant to work with + the parallel testsuite harness at all (these should be very very few), + set the shell variable 'am_serial_tests' to "yes" before including + ./defs. Some tests in the Automake-NG testsuite are auto-generated; those tests might have custom extensions, but their basename (that is, with such diff --git a/t/am-tests-environment.sh b/t/am-tests-environment.sh index 3a6e75532..f2931e6d0 100755 --- a/t/am-tests-environment.sh +++ b/t/am-tests-environment.sh @@ -17,7 +17,6 @@ # parallel-tests: check AM_TESTS_ENVIRONMENT support, and its # interactions with TESTS_ENVIRONMENT. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh index 77dd09820..883df4834 100644 --- a/t/ax/tap-summary-aux.sh +++ b/t/ax/tap-summary-aux.sh @@ -16,7 +16,6 @@ # Auxiliary script for tests on TAP support: checking testsuite summary. -am_parallel_tests=yes . ./defs || Exit 1 br='============================================================================' diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh index df51b149c..de775584a 100644 --- a/t/ax/testsuite-summary-checks.sh +++ b/t/ax/testsuite-summary-checks.sh @@ -20,7 +20,6 @@ # testsuite output, packages with and without bug-report addresses, # testsuites in subdirectories, ...) -am_parallel_tests=yes . ./defs || Exit 1 case $use_colors in diff --git a/t/backcompat5.sh b/t/backcompat5.sh index 6bfb1c21e..fda98f47d 100755 --- a/t/backcompat5.sh +++ b/t/backcompat5.sh @@ -19,7 +19,7 @@ # This script can also serve as mild stress-testing for Automake. # See also the similar test 'backcompat6.test'. -am_parallel_tests=no +am_serial_tests=yes am_create_testdir=empty . ./defs || Exit 1 diff --git a/t/check-concurrency-bug9245.sh b/t/check-concurrency-bug9245.sh index 87fcadece..177806a7f 100755 --- a/t/check-concurrency-bug9245.sh +++ b/t/check-concurrency-bug9245.sh @@ -47,15 +47,11 @@ $AUTOMAKE -a for j in '' -j1 -j2; do $MAKE $j check && Exit 1 $MAKE $j TESTS=foo.test check && Exit 1 - if test x"$am_parallel_tests" = x"yes"; then - $MAKE $j recheck && Exit 1 - $MAKE $j TESTS=foo check && Exit 1 - rm -f test-suite.log - $MAKE $j test-suite.log && Exit 1 - test -f test-suite.log || Exit 1 - else - : # For shells with buggy 'set -e'. - fi + $MAKE $j recheck && Exit 1 + $MAKE $j TESTS=foo check && Exit 1 + rm -f test-suite.log + $MAKE $j test-suite.log && Exit 1 + test -f test-suite.log || Exit 1 done : diff --git a/t/check-exported-srcdir.sh b/t/check-exported-srcdir.sh index 124269bc3..c6fda2125 100755 --- a/t/check-exported-srcdir.sh +++ b/t/check-exported-srcdir.sh @@ -18,11 +18,12 @@ # parallel-tests option enabled) exports the 'srcdir' value in the # environment of the tests. This is documented in the manual. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 show_info () { - if test x"$am_parallel_tests" = x"yes"; then + if test x"$am_serial_tests" != x"yes"; then cat foo.log cat test-suite.log else diff --git a/t/check-fd-redirect.sh b/t/check-fd-redirect.sh index 5a64c229a..618aa80a9 100755 --- a/t/check-fd-redirect.sh +++ b/t/check-fd-redirect.sh @@ -18,6 +18,7 @@ # AM_TESTS_FD_REDIRECT. # See also related test 'parallel-tests-fd-redirect.test'. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 cat >> configure.ac << 'END' @@ -50,7 +51,7 @@ do_check () cat stdout cat stderr >&2 cat four - test x"$am_parallel_tests" != x"yes" || cat foo.log + test x"$am_serial_tests" = x"yes" || cat foo.log test $st -eq 0 grep '[ /]foo\.test: foofoofoo$' stdout grep '[ /]foo\.test: barbarbar$' stderr diff --git a/t/check-no-test-driver.sh b/t/check-no-test-driver.sh index cccc0ed57..84ea32599 100755 --- a/t/check-no-test-driver.sh +++ b/t/check-no-test-driver.sh @@ -18,7 +18,7 @@ # installed or referenced when the 'parallel-tests' option is not # used. -am_parallel_tests=no +am_serial_tests=yes . ./defs || Exit 1 echo 'TESTS = foo.test' > Makefile.am diff --git a/t/check-subst-prog.sh b/t/check-subst-prog.sh index 30e87632f..540c7490b 100755 --- a/t/check-subst-prog.sh +++ b/t/check-subst-prog.sh @@ -17,6 +17,7 @@ # Check @substituted@ TESTS, some of which are also PROGRAMS. # See also sister test 'check-subst.test'. +# For gen-testsuite-part: ==> try-with-serial-tests <== required='cc native' . ./defs || Exit 1 diff --git a/t/check-subst.sh b/t/check-subst.sh index 79d7526a0..ac8fe8905 100755 --- a/t/check-subst.sh +++ b/t/check-subst.sh @@ -19,6 +19,7 @@ # substituted names: this is necessary for parallel-tests. # See also sister test 'check-subst-prog.test'. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 cat >> configure.ac << 'END' @@ -32,7 +33,7 @@ TESTS = pass-script.test xfail-script.test @script_tests@ XFAIL_TESTS = @xfail_tests@ END -if test "$am_parallel_tests" = yes; then +if test x"$am_serial_tests" != x"yes"; then unindent >> Makefile.am <<'END' TEST_EXTENSIONS = .sh .test SH_LOG_COMPILER = $(SHELL) @@ -51,7 +52,7 @@ cp pass-script.test subst-pass-script.sh cp xfail-script.test subst-xfail-script.sh chmod a+x pass-script.test xfail-script.test -if test "$am_parallel_tests" != yes; then +if test x"$am_serial_tests" = x"yes"; then chmod a+x subst-pass-script.sh subst-xfail-script.sh fi @@ -72,7 +73,7 @@ for vpath in false : ; do $srcdir/configure $MAKE all $MAKE check - if test "$am_parallel_tests" = yes; then + if test x"$am_serial_tests" != x"yes"; then ls -l test -f pass-script.log test -f xfail-script.log diff --git a/t/check-tests-in-builddir.sh b/t/check-tests-in-builddir.sh index 9f1fe4a6b..323c3bca2 100755 --- a/t/check-tests-in-builddir.sh +++ b/t/check-tests-in-builddir.sh @@ -17,6 +17,7 @@ # Check that the testsuite driver can find test in the srcdir as # well as in builddir, and that is prefers those in the builddir. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 cat >> configure.ac << 'END' @@ -55,26 +56,27 @@ $MAKE check >out 2>&1 || { cat out; Exit1; } cat out # The simple-tests driver does not strip VPATH components from # the name of the test, but the parallel-tests driver should. -if test x"$am_parallel_tests" = x"yes"; then - grep '\.\./foo' out && Exit 1 - grep '^PASS: foo.test *$' out +if test x"$am_serial_tests" = x"yes"; then + grep '^PASS: .*foo\.test *$' out else - grep '^PASS: .*foo.test *$' out + grep '\.\./foo' out && Exit 1 + grep '^PASS: foo\.test *$' out fi -grep '^PASS: bar.test *$' out +grep '^PASS: bar\.test *$' out rm -f test-suite.log foo.log bar.log FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 && { cat out; Exit1; } cat out -# See comments above. -if test x"$am_parallel_tests" = x"yes"; then - grep '\.\./foo' out && Exit 1 - grep '^FAIL: foo.test *$' out +# The simple-tests driver does not strip VPATH components from +# the name of the test, but the parallel-tests driver should. +if test x"$am_serial_tests" = x"yes"; then + grep '^FAIL: .*foo\.test *$' out else - grep '^FAIL: .*foo.test *$' out + grep '\.\./foo' out && Exit 1 + grep '^FAIL: foo\.test *$' out fi -grep '^PASS: bar.test *$' out +grep '^PASS: bar\.test *$' out rm -f test-suite.log foo.log bar.log @@ -83,8 +85,8 @@ rm -f test-suite.log foo.log bar.log cp bar.test foo.test FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 || { cat out; Exit1; } cat out -grep '^PASS: foo.test *$' out -grep '^PASS: bar.test *$' out +grep '^PASS: foo\.test *$' out +grep '^PASS: bar\.test *$' out # The tests in the builddir must be preferred also by "make dist". FOO_EXIT_STATUS=1 $MAKE distcheck diff --git a/t/check.sh b/t/check.sh index c9ab0fa0f..1edd60fb0 100755 --- a/t/check.sh +++ b/t/check.sh @@ -16,15 +16,14 @@ # Test Automake style tests. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 cat > Makefile.am << 'END' TESTS = frob.test END -test x"$am_parallel_tests" != x"yes" || : > test-driver - -: > frob.test +test x"$am_serial_tests" = x"yes" || : > test-driver $ACLOCAL $AUTOMAKE diff --git a/t/check10.sh b/t/check10.sh index ace8e5a0b..d108335eb 100755 --- a/t/check10.sh +++ b/t/check10.sh @@ -17,7 +17,7 @@ # Check singular and plural in test summaries. # This test only makes sense for the older serial testsuite driver. -am_parallel_tests=no +am_serial_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/check11.sh b/t/check11.sh index 79a040ad2..9d56a7c02 100755 --- a/t/check11.sh +++ b/t/check11.sh @@ -16,6 +16,7 @@ # Check skip summary. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 cat >> configure.ac << 'END' @@ -41,20 +42,20 @@ $AUTOMAKE -a $MAKE check TESTS=skip >stdout || { cat stdout; Exit 1; } cat stdout -if test x"$am_parallel_tests" = x"yes"; then - count_test_results total=1 pass=0 fail=0 skip=1 xfail=0 xpass=0 error=0 -else +if test x"$am_serial_tests" = x"yes"; then grep '1.*passed' stdout && Exit 1 : For shells with buggy 'set -e'. +else + count_test_results total=1 pass=0 fail=0 skip=1 xfail=0 xpass=0 error=0 fi $MAKE check TESTS="skip skip2" >stdout || { cat stdout; Exit 1; } cat stdout -if test x"$am_parallel_tests" = x"yes"; then - count_test_results total=2 pass=0 fail=0 skip=2 xfail=0 xpass=0 error=0 -else +if test x"$am_serial_tests" = x"yes"; then grep '2.*passed' stdout && Exit 1 : For shells with buggy 'set -e'. +else + count_test_results total=2 pass=0 fail=0 skip=2 xfail=0 xpass=0 error=0 fi : diff --git a/t/check12.sh b/t/check12.sh index 1dbbae071..e228e21e1 100755 --- a/t/check12.sh +++ b/t/check12.sh @@ -17,6 +17,7 @@ # Test to make sure dejagnu tests, automake-style tests, and check-local # target can coexist. +# For gen-testsuite-part: ==> try-with-serial-tests <== required=runtest . ./defs || Exit 1 @@ -118,8 +119,8 @@ for vpath in : false; do if $vpath; then srcdir=.. - mkdir build_ - cd build_ + mkdir build + cd build else srcdir=. fi @@ -136,7 +137,7 @@ for vpath in : false; do test -f spanner.log test -f spanner.sum # This checks will be run only by the autogenerated 'check12-p.test'. - if test x"$am_parallel_tests" = x"yes"; then + if test x"$am_serial_tests" != x"yes"; then test -f test-suite.log test -f a.log test -f b.log @@ -168,7 +169,7 @@ for vpath in : false; do B_EXIT_STATUS=1 $MAKE check && Exit 1 # This checks will be run only by the autogenerated 'check12-p.test'. - if test x"$am_parallel_tests" = x"yes"; then + if test x"$am_serial_tests" != x"yes"; then cat test-suite.log cat a.log cat b.log @@ -192,7 +193,7 @@ for vpath in : false; do grep 'FAIL: test_hammer' hammer.sum grep 'FAIL:' spanner.sum && Exit 1 # This checks will be run only by the autogenerated 'check12-p.test'. - if test x"$am_parallel_tests" = x"yes"; then + if test x"$am_serial_tests" != x"yes"; then cat test-suite.log cat a.log cat b.log diff --git a/t/check2.sh b/t/check2.sh index 8a05c9cc8..73eb0b7a5 100755 --- a/t/check2.sh +++ b/t/check2.sh @@ -16,6 +16,7 @@ # Test Automake style tests. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 cat >> configure.ac << 'END' @@ -43,9 +44,7 @@ echo.sh: CLEANFILES = echo.sh END -if test x"$am_parallel_tests" = x"yes"; then - cp "$am_scriptdir/test-driver" . -fi +test x"$am_serial_tests" = x"yes" || cp "$am_scriptdir/test-driver" . $ACLOCAL $AUTOCONF diff --git a/t/check3.sh b/t/check3.sh index 3edfd9872..69b6a674c 100755 --- a/t/check3.sh +++ b/t/check3.sh @@ -17,6 +17,7 @@ # Make sure 'check:' and 'install:' honor $(BUILT_SOURCES). # PR/359. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/check4.sh b/t/check4.sh index 145b0bdf3..dca05429f 100755 --- a/t/check4.sh +++ b/t/check4.sh @@ -16,6 +16,7 @@ # Make sure 'make -k check' processes all directories. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/check5.sh b/t/check5.sh index bc10ef559..56504283d 100755 --- a/t/check5.sh +++ b/t/check5.sh @@ -16,6 +16,7 @@ # Test TESTS = $(check_PROGRAMS) +# For gen-testsuite-part: ==> try-with-serial-tests <== required='cc native' . ./defs || Exit 1 diff --git a/t/check6.sh b/t/check6.sh index b6f6a670b..0f33f8d55 100755 --- a/t/check6.sh +++ b/t/check6.sh @@ -17,6 +17,7 @@ # Test for PR 400: XFAIL_TESTS delimited by TABs. # Also test that Solaris make VPATH rewriting is honored +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/check7.sh b/t/check7.sh index 962cbe082..5e4cafb38 100755 --- a/t/check7.sh +++ b/t/check7.sh @@ -16,6 +16,7 @@ # Check EXEEXT extension for XFAIL_TESTS. +# For gen-testsuite-part: ==> try-with-serial-tests <== required=cc . ./defs || Exit 1 @@ -60,7 +61,7 @@ $AUTOMAKE -a ./configure $MAKE check -if test x"$am_parallel_tests" != x"yes"; then +if test x"$am_serial_tests" = x"yes"; then $MAKE EXEEXT=.bin print-xfail-tests >stdout || { cat stdout; Exit 1; } cat stdout $FGREP 'BEG: a.bin b c.bin d.bin :END' stdout diff --git a/t/check8.sh b/t/check8.sh index 5ed1bb005..c3b9a4b88 100755 --- a/t/check8.sh +++ b/t/check8.sh @@ -16,6 +16,7 @@ # Check subdir TESTS. +# For gen-testsuite-part: ==> try-with-serial-tests <== required='cc native' . ./defs || Exit 1 diff --git a/t/color.sh b/t/color.sh index 3804c0388..e41352ac9 100755 --- a/t/color.sh +++ b/t/color.sh @@ -17,6 +17,7 @@ # Test Automake TESTS color output, by forcing it. # Keep this in sync with the sister test 'color2.test'. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 esc='' @@ -85,10 +86,10 @@ test_color () cat stdout | grep "^${red}XPASS${std}: .*xpass" # The old serial testsuite driver doesn't distinguish between failures # and hard errors. - if test x"$am_parallel_tests" = x"yes"; then - cat stdout | grep "^${mgn}ERROR${std}: .*error" - else + if test x"$am_serial_tests" = x"yes"; then cat stdout | grep "^${red}FAIL${std}: .*error" + else + cat stdout | grep "^${mgn}ERROR${std}: .*error" fi : } diff --git a/t/color2.sh b/t/color2.sh index 4e6862a9d..4c29eb362 100755 --- a/t/color2.sh +++ b/t/color2.sh @@ -17,6 +17,7 @@ # Test Automake TESTS color output, using the expect(1) program. # Keep this in sync with the sister test 'color.test'. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 esc='' @@ -92,10 +93,10 @@ test_color () cat stdout | grep "^${red}XPASS${std}: .*xpass" # The old serial testsuite driver doesn't distinguish between failures # and hard errors. - if test x"$am_parallel_tests" = x"yes"; then - cat stdout | grep "^${mgn}ERROR${std}: .*error" - else + if test x"$am_serial_tests" = x"yes"; then cat stdout | grep "^${red}FAIL${std}: .*error" + else + cat stdout | grep "^${mgn}ERROR${std}: .*error" fi : } diff --git a/t/dejagnu.sh b/t/dejagnu.sh index 14b118c8a..583158f34 100755 --- a/t/dejagnu.sh +++ b/t/dejagnu.sh @@ -24,7 +24,7 @@ AUTOMAKE_OPTIONS = dejagnu TESTS = frob.test END -test x"$am_parallel_tests" != x"yes" || : > test-driver +test x"$am_serial_tests" = x"yes" || : > test-driver $ACLOCAL $AUTOMAKE diff --git a/t/dist-auxdir-many-subdirs.sh b/t/dist-auxdir-many-subdirs.sh index db9aa9407..f84514a79 100755 --- a/t/dist-auxdir-many-subdirs.sh +++ b/t/dist-auxdir-many-subdirs.sh @@ -18,7 +18,6 @@ # same config-aux files. am_create_testdir=empty -am_parallel_tests=yes required=cc . ./defs || Exit 1 diff --git a/t/distcheck-pr10470.sh b/t/distcheck-pr10470.sh index efb4380a3..de8a98468 100755 --- a/t/distcheck-pr10470.sh +++ b/t/distcheck-pr10470.sh @@ -19,7 +19,6 @@ # by a process (e.g., that is its "current working directory"). # See automake bug#10470. -am_parallel_tests=no . ./defs || Exit 1 mkdir foo.d diff --git a/t/exeext4.sh b/t/exeext4.sh index 53c37dfe6..a8595e334 100755 --- a/t/exeext4.sh +++ b/t/exeext4.sh @@ -17,7 +17,7 @@ # Make sure $(EXEEXT) is appended to programs and to tests that are # programs, but not to @substitutions@. -am_parallel_tests=no +am_serial_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/install-info-dir.sh b/t/install-info-dir.sh index d8b32d863..12b22930e 100755 --- a/t/install-info-dir.sh +++ b/t/install-info-dir.sh @@ -67,7 +67,15 @@ $MAKE info test -f foo.info if install-info --version; then - have_installinfo=yes + # Skip some checks even if 'install-info' is the one from dpkg, not + # the one from GNU info, as the former might try to create files in + # '/var/backups/', causing spurious failures like this for non-root + # users. + if install-info --version | $EGREP -i '(dpkg|debian) install-info'; then + have_installinfo=no + else + have_installinfo=yes + fi else have_installinfo=no fi diff --git a/t/java-compile-run-flat.sh b/t/java-compile-run-flat.sh index 904e52349..c4f1eed7f 100755 --- a/t/java-compile-run-flat.sh +++ b/t/java-compile-run-flat.sh @@ -24,7 +24,7 @@ # 'parallel-tests' driver. required='java javac' -am_parallel_tests=no +am_serial_tests=yes . ./defs || Exit 1 echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.ac diff --git a/t/java-compile-run-nested.sh b/t/java-compile-run-nested.sh index bf0a9184f..a3e9c2909 100755 --- a/t/java-compile-run-nested.sh +++ b/t/java-compile-run-nested.sh @@ -25,7 +25,6 @@ # of the older non-parallel 'simple-tests' driver. required='java javac' -am_parallel_tests=yes . ./defs || Exit 1 echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.ac diff --git a/t/make-dryrun.tap b/t/make-dryrun.tap index 57c7a1c6c..eec824719 100755 --- a/t/make-dryrun.tap +++ b/t/make-dryrun.tap @@ -16,7 +16,6 @@ # Check that $(am__make_dryrun) works as expected. -am_parallel_tests=yes # Avoid generation of a useless wrapper test. . ./defs || Exit 1 plan_ 14 diff --git a/t/maken3.sh b/t/maken3.sh index f0d836f82..5f9981e4a 100755 --- a/t/maken3.sh +++ b/t/maken3.sh @@ -22,6 +22,7 @@ # This test exercises the GCS-mandated targets (except for dist) # as well as tags, TAGS. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 mkdir sub sub2 diff --git a/t/parallel-tests-concatenated-suffix.sh b/t/parallel-tests-concatenated-suffix.sh index 079122226..11e3f0222 100755 --- a/t/parallel-tests-concatenated-suffix.sh +++ b/t/parallel-tests-concatenated-suffix.sh @@ -17,7 +17,6 @@ # The parallel-tests driver should be able to cope with test scripts # whose names end with several concatenated suffixes. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-console-output.sh b/t/parallel-tests-console-output.sh index ac43b2537..5a78efdbd 100755 --- a/t/parallel-tests-console-output.sh +++ b/t/parallel-tests-console-output.sh @@ -17,7 +17,6 @@ # parallel-tests: some checks on console output about testsuite # progress. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-driver-install.sh b/t/parallel-tests-driver-install.sh index b538799e0..fcfa38d7f 100755 --- a/t/parallel-tests-driver-install.sh +++ b/t/parallel-tests-driver-install.sh @@ -17,7 +17,6 @@ # Check that auxiliary script 'test-driver' gets automatically installed # in the correct directory by 'parallel-tests' option. -am_parallel_tests=yes . ./defs || Exit 1 : Try first with parallel-tests defined in AM_INIT_AUTOMAKE. diff --git a/t/parallel-tests-dry-run-1.sh b/t/parallel-tests-dry-run-1.sh index b094c1841..6fdcb9820 100755 --- a/t/parallel-tests-dry-run-1.sh +++ b/t/parallel-tests-dry-run-1.sh @@ -17,7 +17,6 @@ # Check parallel-tests interactions with "make -n". # See also sister test 'parallel-tests-dry-run-2.test'. -am_parallel_tests=yes . ./defs || Exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/parallel-tests-dry-run-2.sh b/t/parallel-tests-dry-run-2.sh index 0d13677c2..20ccb5dc4 100755 --- a/t/parallel-tests-dry-run-2.sh +++ b/t/parallel-tests-dry-run-2.sh @@ -17,7 +17,6 @@ # Check parallel-tests interactions with "make -n". # See also sister test 'parallel-tests-dry-run-1.test'. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-dynamic.sh b/t/parallel-tests-dynamic.sh index b94fd1669..c8b3b8f8d 100755 --- a/t/parallel-tests-dynamic.sh +++ b/t/parallel-tests-dynamic.sh @@ -17,7 +17,6 @@ # Check that dynamic content for $(TESTS) is supported, both when set from # inside the Makefile.am and when overriddend from the command line. -am_parallel_tests=yes . ./defs || Exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/parallel-tests-empty-tests.sh b/t/parallel-tests-empty-tests.sh index f16095bc1..9edd26021 100755 --- a/t/parallel-tests-empty-tests.sh +++ b/t/parallel-tests-empty-tests.sh @@ -16,7 +16,6 @@ # Check parallel-tests features: empty TESTS -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-exeext.sh b/t/parallel-tests-exeext.sh index 1a3a788f4..80d0c5d85 100755 --- a/t/parallel-tests-exeext.sh +++ b/t/parallel-tests-exeext.sh @@ -17,7 +17,6 @@ # parallel-tests: # - check2.am and interaction with $(EXEEXT) -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-exit-statuses.sh b/t/parallel-tests-exit-statuses.sh index bf75fa3ce..60732b3aa 100755 --- a/t/parallel-tests-exit-statuses.sh +++ b/t/parallel-tests-exit-statuses.sh @@ -17,7 +17,6 @@ # Check parallel-tests features: normal and special exit statuses # in the test scripts. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-extra-programs.sh b/t/parallel-tests-extra-programs.sh index 413799851..2fd09cfc5 100755 --- a/t/parallel-tests-extra-programs.sh +++ b/t/parallel-tests-extra-programs.sh @@ -18,7 +18,6 @@ # (or even be) $(EXTRA_PROGRAMS). required='cc native' -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-fd-redirect-exeext.sh b/t/parallel-tests-fd-redirect-exeext.sh index 7904b2d89..bc9b18a07 100755 --- a/t/parallel-tests-fd-redirect-exeext.sh +++ b/t/parallel-tests-fd-redirect-exeext.sh @@ -22,7 +22,6 @@ # sister test 'parallel-tests-fd-redirect.test'. required='cc native' -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-fd-redirect.sh b/t/parallel-tests-fd-redirect.sh index ad5815daf..513b523a2 100755 --- a/t/parallel-tests-fd-redirect.sh +++ b/t/parallel-tests-fd-redirect.sh @@ -20,7 +20,6 @@ # check for tests that are binary executables. # See also the more generic test 'check-fd-redirect.test'. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-fork-bomb.sh b/t/parallel-tests-fork-bomb.sh index e1c22824e..d456ab7a3 100755 --- a/t/parallel-tests-fork-bomb.sh +++ b/t/parallel-tests-fork-bomb.sh @@ -18,7 +18,6 @@ # - If $(TEST_SUITE_LOG) is in $(TEST_LOGS), we get a diagnosed # error, not a make hang or a system freeze. -am_parallel_tests=yes . ./defs || Exit 1 # We don't want localized error messages from make, since we'll have diff --git a/t/parallel-tests-harderror.sh b/t/parallel-tests-harderror.sh index 6f69eef21..b51b27182 100755 --- a/t/parallel-tests-harderror.sh +++ b/t/parallel-tests-harderror.sh @@ -16,7 +16,6 @@ # Check parallel-tests features: DISABLE_HARD_ERRORS -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-interrupt.tap b/t/parallel-tests-interrupt.tap index 39a04a753..afc19568d 100755 --- a/t/parallel-tests-interrupt.tap +++ b/t/parallel-tests-interrupt.tap @@ -19,7 +19,6 @@ # but we couldn't find a better way to deal with inter-processes # signals and the whole process-synchronization mess. -am_parallel_tests=yes . ./defs || Exit 1 plan_ 16 diff --git a/t/parallel-tests-log-compiler-1.sh b/t/parallel-tests-log-compiler-1.sh index 95f51c089..d3f012a81 100755 --- a/t/parallel-tests-log-compiler-1.sh +++ b/t/parallel-tests-log-compiler-1.sh @@ -19,7 +19,6 @@ # and xxx_LOG_FLAGS), also with AC_SUBST'd stuff. # See also related test 'parallel-tests-log-compiler-2.test'. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-log-compiler-2.sh b/t/parallel-tests-log-compiler-2.sh index 7443e263f..72fba680c 100755 --- a/t/parallel-tests-log-compiler-2.sh +++ b/t/parallel-tests-log-compiler-2.sh @@ -19,7 +19,6 @@ # and xxx_LOG_FLAGS), when some tests are PROGRAMS. # See also related test 'parallel-tests-log-compiler-1.test'. -am_parallel_tests=yes required='cc native' . ./defs || Exit 1 diff --git a/t/parallel-tests-log-override.sh b/t/parallel-tests-log-override.sh index 53ed31030..a02ec5402 100755 --- a/t/parallel-tests-log-override.sh +++ b/t/parallel-tests-log-override.sh @@ -16,7 +16,6 @@ # Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG). -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac <<'END' diff --git a/t/parallel-tests-logvars-example.sh b/t/parallel-tests-logvars-example.sh index fc922a519..301eb57d0 100755 --- a/t/parallel-tests-logvars-example.sh +++ b/t/parallel-tests-logvars-example.sh @@ -17,7 +17,6 @@ # Test the example of usage of generic and extension-specific # LOG_COMPILER, LOG_FLAGS and LOG_DEPENDNECIES given in the manual. -am_parallel_tests=yes required=python . ./defs || Exit 1 diff --git a/t/parallel-tests-longest-stem.sh b/t/parallel-tests-longest-stem.sh index d93685d54..a2d06ca32 100755 --- a/t/parallel-tests-longest-stem.sh +++ b/t/parallel-tests-longest-stem.sh @@ -18,7 +18,6 @@ # extension-less tests. This is required to allow the user to have # a, say, 'all.test' test case even in the face of the 'all' target. -am_parallel_tests=yes . ./defs || Exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/parallel-tests-many.sh b/t/parallel-tests-many.sh index bf5c8dc8c..e76ddc497 100755 --- a/t/parallel-tests-many.sh +++ b/t/parallel-tests-many.sh @@ -18,7 +18,6 @@ # an exceeded command line length when there are many tests. # For automake bug#7868. This test is currently expected to fail. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-no-color-in-log.sh b/t/parallel-tests-no-color-in-log.sh index 313d8d389..603812bd4 100755 --- a/t/parallel-tests-no-color-in-log.sh +++ b/t/parallel-tests-no-color-in-log.sh @@ -16,7 +16,6 @@ # Colorized output from the testsuite report shouldn't end up in log files. -am_parallel_tests=yes . ./defs || Exit 1 esc='' diff --git a/t/parallel-tests-no-repeat.sh b/t/parallel-tests-no-repeat.sh index c3220c05d..2c696506a 100755 --- a/t/parallel-tests-no-repeat.sh +++ b/t/parallel-tests-no-repeat.sh @@ -17,7 +17,6 @@ # The parallel-tests harness do not cause the same test to be # uselessly run multiple times. -am_parallel_tests=yes . ./defs || Exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/parallel-tests-once.sh b/t/parallel-tests-once.sh index 53ee677fb..51912fbd1 100755 --- a/t/parallel-tests-once.sh +++ b/t/parallel-tests-once.sh @@ -18,7 +18,6 @@ # clean directory. An early implementation of the '.trs' intermediate # files incurred a similar problem. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-per-suffix-deps.sh b/t/parallel-tests-per-suffix-deps.sh index 496c9f6ef..d60a609e2 100755 --- a/t/parallel-tests-per-suffix-deps.sh +++ b/t/parallel-tests-per-suffix-deps.sh @@ -19,7 +19,6 @@ # We do so with the help of "${prefix}LOG_DEPENDENCIES" variables. # See the last wishlist in automake bug#11287. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac <<'END' diff --git a/t/parallel-tests-recheck-depends-on-all.sh b/t/parallel-tests-recheck-depends-on-all.sh index 6c9e4cba9..9464a360d 100755 --- a/t/parallel-tests-recheck-depends-on-all.sh +++ b/t/parallel-tests-recheck-depends-on-all.sh @@ -17,7 +17,6 @@ # The parallel-tests 'recheck' target must depend on the 'all' target. # See automake bug#11252. -am_parallel_tests=yes required='cc native' . ./defs || Exit 1 diff --git a/t/parallel-tests-reset-term.sh b/t/parallel-tests-reset-term.sh index 53e542c27..cf9fb6cfb 100755 --- a/t/parallel-tests-reset-term.sh +++ b/t/parallel-tests-reset-term.sh @@ -17,7 +17,6 @@ # Check that the parallel-tests driver correctly handle overrides of the # TERM variable by either TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT. -am_parallel_tests=yes . ./defs || Exit 1 esc='[' diff --git a/t/parallel-tests-srcdir-in-test-name.sh b/t/parallel-tests-srcdir-in-test-name.sh index 4c834d900..db81aa6e0 100755 --- a/t/parallel-tests-srcdir-in-test-name.sh +++ b/t/parallel-tests-srcdir-in-test-name.sh @@ -23,7 +23,6 @@ # manual for the ugliness in this area, when VPATH comes into # play. :-/ -am_parallel_tests=yes . ./defs || Exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/parallel-tests-subdir.sh b/t/parallel-tests-subdir.sh index 6848edbd8..2698a53df 100755 --- a/t/parallel-tests-subdir.sh +++ b/t/parallel-tests-subdir.sh @@ -17,7 +17,6 @@ # Check that the parallel-tests driver creates parent directories for # the log files when needed. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-suffix-prog.sh b/t/parallel-tests-suffix-prog.sh index abd4a5c42..28dd34991 100755 --- a/t/parallel-tests-suffix-prog.sh +++ b/t/parallel-tests-suffix-prog.sh @@ -18,7 +18,6 @@ # - suffix rules, with PROGRAMS involved # See also sister test 'parallel-tests-suffix.test'. -am_parallel_tests=yes required='cc native' . ./defs || Exit 1 diff --git a/t/parallel-tests-suffix.sh b/t/parallel-tests-suffix.sh index bd72d0d57..9e9e8432a 100755 --- a/t/parallel-tests-suffix.sh +++ b/t/parallel-tests-suffix.sh @@ -18,7 +18,6 @@ # - suffix rules # See also sister test 'parallel-tests-suffix-prog.test'. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests-trailing-bslash.sh b/t/parallel-tests-trailing-bslash.sh index 4b3bdf847..129176480 100755 --- a/t/parallel-tests-trailing-bslash.sh +++ b/t/parallel-tests-trailing-bslash.sh @@ -19,7 +19,6 @@ # older bash versions (e.g., bash 2.05b). # See automake bug#10436. -am_parallel_tests=yes . ./defs || Exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/parallel-tests-unreadable.sh b/t/parallel-tests-unreadable.sh index 6bc9fba9f..fa2448a10 100755 --- a/t/parallel-tests-unreadable.sh +++ b/t/parallel-tests-unreadable.sh @@ -17,7 +17,6 @@ # Check that the testsuite driver copes well with unreadable '.log' # and '.trs' files. -am_parallel_tests=yes . ./defs || Exit 1 : > t diff --git a/t/parallel-tests.sh b/t/parallel-tests.sh index 538ee7550..2530134ce 100755 --- a/t/parallel-tests.sh +++ b/t/parallel-tests.sh @@ -22,7 +22,6 @@ # - TESTS redefinition at runtime (with and without test suffixes) # - AM_LAZY_CHECK -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests10.sh b/t/parallel-tests10.sh index 239648263..9746024d7 100755 --- a/t/parallel-tests10.sh +++ b/t/parallel-tests10.sh @@ -18,7 +18,6 @@ # - trailing whitespace in TESTS # GNU make 3.80 may expand trailing white space to '.log'. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests2.sh b/t/parallel-tests2.sh index f7dae9f8b..8dd1a1bfe 100755 --- a/t/parallel-tests2.sh +++ b/t/parallel-tests2.sh @@ -20,7 +20,6 @@ # FIXME: the features tested by this script has been moved in contrib. # FIXME: We should move this script accordingly. -am_parallel_tests=yes . ./defs || Exit 1 # Try the variants that are tried in check-html.am. diff --git a/t/parallel-tests3.sh b/t/parallel-tests3.sh index e5063c72f..16c94c69b 100755 --- a/t/parallel-tests3.sh +++ b/t/parallel-tests3.sh @@ -17,7 +17,6 @@ # Check parallel-tests features: # - concurrent parallel execution -am_parallel_tests=yes . ./defs || Exit 1 case $MAKE in diff --git a/t/parallel-tests5.sh b/t/parallel-tests5.sh index 62256e0a5..4c01560be 100755 --- a/t/parallel-tests5.sh +++ b/t/parallel-tests5.sh @@ -20,7 +20,6 @@ # Actually, this test doesn't ensure that things happen concurrently. # It merely serves as demonstration. :-) -am_parallel_tests=yes required='cc native' . ./defs || Exit 1 diff --git a/t/parallel-tests6.sh b/t/parallel-tests6.sh index 76ba5962e..94b464d5d 100755 --- a/t/parallel-tests6.sh +++ b/t/parallel-tests6.sh @@ -18,7 +18,6 @@ # - empty TESTS # See parallel-tests10.test for a similar issue. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests8.sh b/t/parallel-tests8.sh index 46e412047..4f322319a 100755 --- a/t/parallel-tests8.sh +++ b/t/parallel-tests8.sh @@ -16,7 +16,6 @@ # Check parallel-tests features: generated distributed tests. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/parallel-tests9.sh b/t/parallel-tests9.sh index f22be8d73..42d0e2d9c 100755 --- a/t/parallel-tests9.sh +++ b/t/parallel-tests9.sh @@ -17,7 +17,6 @@ # Check parallel-tests features: # - recheck -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/posixsubst-tests.sh b/t/posixsubst-tests.sh index 37c23d3a0..30d283a43 100755 --- a/t/posixsubst-tests.sh +++ b/t/posixsubst-tests.sh @@ -17,6 +17,7 @@ # Test that POSIX variable expansion '$(var:str=rpl)' works when used # with the TESTS special variable. +# For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/pr401.sh b/t/pr401.sh index a14349849..849ee5fc2 100755 --- a/t/pr401.sh +++ b/t/pr401.sh @@ -17,7 +17,6 @@ # Check support for AC_CONFIG_LIBOBJ_DIR vs LIBOBJS. # (pr401b.test and pr401c.test do the same for LTLIBOBJS and ALLOCA) -am_parallel_tests=no required=cc . ./defs || Exit 1 @@ -83,7 +82,7 @@ cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script 'ar-lib'" $ACLOCAL $AUTOCONF -$AUTOMAKE +$AUTOMAKE -a ./configure $MAKE distcheck diff --git a/t/pr401b.sh b/t/pr401b.sh index 3d15671c2..382d1181e 100755 --- a/t/pr401b.sh +++ b/t/pr401b.sh @@ -17,7 +17,6 @@ # Check support for AC_CONFIG_LIBOBJ_DIR vs LTLIBOBJS. # (pr401.test and pr401c.test do the same for LIBOBJS and ALLOCA) -am_parallel_tests=no required='cc libtoolize' . ./defs || Exit 1 diff --git a/t/pr401c.sh b/t/pr401c.sh index 1f238f615..12afade9d 100755 --- a/t/pr401c.sh +++ b/t/pr401c.sh @@ -17,14 +17,12 @@ # Check support for AC_CONFIG_LIBOBJ_DIR vs ALLOCA. # (pr401.test and pr401b.test do the same for LIBOBJS and LTLIBOBJS) -am_parallel_tests=no required=cc . ./defs || Exit 1 mkdir lib src -ac_cv_func_alloca_works=no -export ac_cv_func_alloca_works +ac_cv_func_alloca_works=no; export ac_cv_func_alloca_works cat >lib/alloca.c <<'EOF' const char *feep (void) @@ -85,7 +83,7 @@ cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script 'ar-lib'" $ACLOCAL $AUTOCONF -$AUTOMAKE +$AUTOMAKE -a ./configure $MAKE distcheck diff --git a/t/self-check-env-sanitize.tap b/t/self-check-env-sanitize.tap index bc7818610..c6ac98024 100755 --- a/t/self-check-env-sanitize.tap +++ b/t/self-check-env-sanitize.tap @@ -29,7 +29,7 @@ plan_ 18 # Two times the number of variable names in $vars. vars=' me required - am_parallel_tests + am_serial_tests am_using_tap am_create_testdir am_tap_implementation diff --git a/t/self-check-reexec.tap b/t/self-check-reexec.tap index 7b91008ec..e19a6814b 100755 --- a/t/self-check-reexec.tap +++ b/t/self-check-reexec.tap @@ -48,7 +48,12 @@ for non_bash_shell in \ do test "$non_bash_shell" = : && break $non_bash_shell -c 'exit 0' || continue - $non_bash_shell -c 'test -n "$BASH_VERSION"' && continue + # Be sure to reject also any shell that is Zsh "in disguise" (as can + # be found on some Debian systems, where /bin/ksh can be symlinked to + # /bin/zsh4). This is required because our testsuite does not support + # older versions of Zsh, and that has caused spurious failures in the + # past. + $non_bash_shell -c 'test -n "$ZSH_VERSION$BASH_VERSION"' && continue break done diff --git a/t/serial-tests.sh b/t/serial-tests.sh index 9ac0c5d32..3825f7045 100755 --- a/t/serial-tests.sh +++ b/t/serial-tests.sh @@ -16,8 +16,6 @@ # Option 'serial-tests'. -# To avoid useless generation of a sibling test. -am_parallel_tests=yes am_create_testdir=empty . ./defs || Exit 1 @@ -38,7 +36,7 @@ has_parallel_tests () mkdir one two -cat >> one/configure.ac <<END +cat > one/configure.ac <<END AC_INIT([$me], [1.0]) AM_INIT_AUTOMAKE([serial-tests]) AC_CONFIG_FILES([Makefile]) @@ -46,7 +44,7 @@ END echo 'TESTS = foo.test bar.test' > one/Makefile.am -cat >> two/configure.ac <<END +cat > two/configure.ac <<END AC_INIT([$me], [2.0]) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE([parallel-tests]) diff --git a/t/tap-ambiguous-directive.sh b/t/tap-ambiguous-directive.sh index 32b1b803e..75a259cbe 100755 --- a/t/tap-ambiguous-directive.sh +++ b/t/tap-ambiguous-directive.sh @@ -18,7 +18,6 @@ # - handling of "ambiguous" TODO and SKIP directives # See also related test 'tap-todo-skip-together.test'. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-autonumber.sh b/t/tap-autonumber.sh index 43df711fa..7c6aed0b7 100755 --- a/t/tap-autonumber.sh +++ b/t/tap-autonumber.sh @@ -20,7 +20,6 @@ # - test results without number get automatically numbered in the # console progress output -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-bad-prog.tap b/t/tap-bad-prog.tap index 5eb1c56b8..260932914 100755 --- a/t/tap-bad-prog.tap +++ b/t/tap-bad-prog.tap @@ -18,7 +18,6 @@ # - missing, unreadable, or not-executable test scripts cause proper # error reports -am_parallel_tests=yes . ./defs || Exit 1 fetch_tap_driver diff --git a/t/tap-bailout-and-logging.sh b/t/tap-bailout-and-logging.sh index cc95d9881..e8e3756d8 100755 --- a/t/tap-bailout-and-logging.sh +++ b/t/tap-bailout-and-logging.sh @@ -18,7 +18,6 @@ # - even after a "Bail out!" directive, all input is still copied in # the log file -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-bailout-leading-space.sh b/t/tap-bailout-leading-space.sh index ead0738dd..cfa6eeee2 100755 --- a/t/tap-bailout-leading-space.sh +++ b/t/tap-bailout-leading-space.sh @@ -20,7 +20,6 @@ # perl implementation of the Automake TAP driver, but expect the latter, # "more modern" behaviour in our awk TAP driver. -am_parallel_tests=yes am_tap_implementation=shell . ./defs || Exit 1 diff --git a/t/tap-bailout-suppress-badexit.sh b/t/tap-bailout-suppress-badexit.sh index 196263992..c7e55db0a 100755 --- a/t/tap-bailout-suppress-badexit.sh +++ b/t/tap-bailout-suppress-badexit.sh @@ -18,7 +18,6 @@ # - A "Bail out!" directive causes the driver to ignore the exit # status of the test script. -am_parallel_tests=yes . ./defs || Exit 1 tests='exit.test exit127.test sighup.test sigterm.test' diff --git a/t/tap-bailout-suppress-later-diagnostic.sh b/t/tap-bailout-suppress-later-diagnostic.sh index 9bc29dec5..bff4d64cc 100755 --- a/t/tap-bailout-suppress-later-diagnostic.sh +++ b/t/tap-bailout-suppress-later-diagnostic.sh @@ -18,7 +18,6 @@ # - A "Bail out!" directive causes the driver to ignore any TAP # diagnostic message in the rest of the following TAP stream. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-bailout-suppress-later-errors.sh b/t/tap-bailout-suppress-later-errors.sh index 8b30542ec..cb98603fd 100755 --- a/t/tap-bailout-suppress-later-errors.sh +++ b/t/tap-bailout-suppress-later-errors.sh @@ -18,7 +18,6 @@ # - A "Bail out!" directive causes the driver to ignore any TAP # result or error in the rest of the following TAP stream. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-bailout.sh b/t/tap-bailout.sh index 1ac40c584..d07d6c324 100755 --- a/t/tap-bailout.sh +++ b/t/tap-bailout.sh @@ -17,7 +17,6 @@ # Basic TAP test protocol support: # - "Bail out!" magic -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-basic.sh b/t/tap-basic.sh index a7fcd0788..60a3c7f87 100755 --- a/t/tap-basic.sh +++ b/t/tap-basic.sh @@ -24,7 +24,6 @@ # Note that some of the features checked here are checked in other # test cases too, usually in a more thorough and detailed way. -am_parallel_tests=yes . ./defs || Exit 1 fetch_tap_driver diff --git a/t/tap-color.sh b/t/tap-color.sh index 64f85a3a4..0999504f0 100755 --- a/t/tap-color.sh +++ b/t/tap-color.sh @@ -17,7 +17,6 @@ # TAP support: # - colorization of TAP results and diagnostic messages -am_parallel_tests=yes . ./defs || Exit 1 esc='' diff --git a/t/tap-common-setup.sh b/t/tap-common-setup.sh index cd0a14d62..b4026d5c1 100755 --- a/t/tap-common-setup.sh +++ b/t/tap-common-setup.sh @@ -16,7 +16,6 @@ # Auxiliary test to set up common data used by many tests on TAP support. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/tap-deps.sh b/t/tap-deps.sh index 9295257e4..9e52b79bc 100755 --- a/t/tap-deps.sh +++ b/t/tap-deps.sh @@ -17,7 +17,6 @@ # Basic TAP test protocol support: # - dependencies between test scripts -am_parallel_tests=yes . ./defs || Exit 1 cat > Makefile.am << 'END' diff --git a/t/tap-diagnostic-custom.sh b/t/tap-diagnostic-custom.sh index bb189fd03..d1a4f98d5 100755 --- a/t/tap-diagnostic-custom.sh +++ b/t/tap-diagnostic-custom.sh @@ -18,7 +18,6 @@ # - option '--diagnostic-string' to customize the string introducing # TAP diagnostics -am_parallel_tests=yes . ./defs || Exit 1 fetch_tap_driver diff --git a/t/tap-diagnostic.sh b/t/tap-diagnostic.sh index 460b98b9a..e7aaff596 100755 --- a/t/tap-diagnostic.sh +++ b/t/tap-diagnostic.sh @@ -18,7 +18,6 @@ # - diagnostic messages (TAP lines with leading "#") # - flags '--comments' and '--no-comments' of the TAP test driver -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-doc.sh b/t/tap-doc.sh index 636c4cff1..a24133365 100755 --- a/t/tap-doc.sh +++ b/t/tap-doc.sh @@ -17,7 +17,6 @@ # Check that an example given in the documentation really works. # See section "Simple Tests" subsection "Script-based Testsuites". -am_parallel_tests=yes . ./defs || Exit 1 fetch_tap_driver diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh index 2864b427e..0efb8c8d3 100755 --- a/t/tap-doc2.sh +++ b/t/tap-doc2.sh @@ -19,7 +19,6 @@ # with the Automake test harness". am_create_testdir=empty -am_parallel_tests=yes . ./defs || Exit 1 cat > Makefile.am <<'END' diff --git a/t/tap-driver-stderr.sh b/t/tap-driver-stderr.sh index 879d051b7..bb54ebf1f 100755 --- a/t/tap-driver-stderr.sh +++ b/t/tap-driver-stderr.sh @@ -18,7 +18,6 @@ # - error messages from awk/shell/perl goes to the console required=non-root -am_parallel_tests=yes am_create_testdir=empty . ./defs || Exit 1 diff --git a/t/tap-empty-diagnostic.sh b/t/tap-empty-diagnostic.sh index 1a8a99ba2..e3f1e155a 100755 --- a/t/tap-empty-diagnostic.sh +++ b/t/tap-empty-diagnostic.sh @@ -17,7 +17,6 @@ # TAP support: # - empty diagnostic messages are discarder -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-empty.sh b/t/tap-empty.sh index 4d3bfda9c..bad40edb1 100755 --- a/t/tap-empty.sh +++ b/t/tap-empty.sh @@ -18,7 +18,6 @@ # - empty TAP input # - blank TAP input -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-escape-directive-2.sh b/t/tap-escape-directive-2.sh index 595c38458..1c72f7969 100755 --- a/t/tap-escape-directive-2.sh +++ b/t/tap-escape-directive-2.sh @@ -17,7 +17,6 @@ # TAP support: # - "escape" TODO and SKIP directives (by escaping the "#" character) -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-escape-directive.sh b/t/tap-escape-directive.sh index 8b242510b..6067af283 100755 --- a/t/tap-escape-directive.sh +++ b/t/tap-escape-directive.sh @@ -17,7 +17,6 @@ # TAP support: # - "escape" TODO and SKIP directives (by escaping the "#" character) -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-exit.sh b/t/tap-exit.sh index abc1ace0d..27179760f 100755 --- a/t/tap-exit.sh +++ b/t/tap-exit.sh @@ -19,7 +19,6 @@ # - the '--ignore-exit' option causes the TAP test driver to ignore # exit statuses of the test scripts. -am_parallel_tests=yes . ./defs || Exit 1 echo TESTS = > Makefile.am diff --git a/t/tap-fancy.sh b/t/tap-fancy.sh index 6815ac54b..846a9d0e6 100755 --- a/t/tap-fancy.sh +++ b/t/tap-fancy.sh @@ -17,7 +17,6 @@ # TAP support: some unusual forms for valid TAP input. # See also related test 'tap-fancy2.test'. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-fancy2.sh b/t/tap-fancy2.sh index bb51d54e5..6ab67c9f6 100755 --- a/t/tap-fancy2.sh +++ b/t/tap-fancy2.sh @@ -17,7 +17,6 @@ # TAP support: more unusual forms for valid TAP input. # See also related test 'tap-fancy.test'. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-global-log.sh b/t/tap-global-log.sh index 2c010465d..9aa11879e 100755 --- a/t/tap-global-log.sh +++ b/t/tap-global-log.sh @@ -17,7 +17,6 @@ # TAP support: # - which log files get copied in the global log? -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-global-result.sh b/t/tap-global-result.sh index 62f57e35c..6f3ad04be 100755 --- a/t/tap-global-result.sh +++ b/t/tap-global-result.sh @@ -18,7 +18,6 @@ # - which global test result derives from different test results # mixed in a single script? -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-lazy-check.sh b/t/tap-lazy-check.sh index de92c3d6b..408646a85 100755 --- a/t/tap-lazy-check.sh +++ b/t/tap-lazy-check.sh @@ -16,7 +16,6 @@ # TAP support: AM_LAZY_CHECK -am_parallel_tests=yes . ./defs || Exit 1 cat > Makefile.am << 'END' diff --git a/t/tap-log.sh b/t/tap-log.sh index 4bc7f28b2..683093853 100755 --- a/t/tap-log.sh +++ b/t/tap-log.sh @@ -22,7 +22,6 @@ # - VERBOSE environment variable support # Keep in sync with 'test-log.test'. -am_parallel_tests=yes . ./defs || Exit 1 cat > Makefile.am << 'END' diff --git a/t/tap-merge-stdout-stderr.sh b/t/tap-merge-stdout-stderr.sh index bf06069f3..6b9995a40 100755 --- a/t/tap-merge-stdout-stderr.sh +++ b/t/tap-merge-stdout-stderr.sh @@ -18,7 +18,6 @@ # - The Automake TAP driver has an option that instruct it to read TAP # input also from the stderr of the test command, not only its stdout. -am_parallel_tests=yes . ./defs || Exit 1 fetch_tap_driver diff --git a/t/tap-missing-plan-and-bad-exit.sh b/t/tap-missing-plan-and-bad-exit.sh index e1ea4fd40..31a702c3b 100755 --- a/t/tap-missing-plan-and-bad-exit.sh +++ b/t/tap-missing-plan-and-bad-exit.sh @@ -19,7 +19,6 @@ # plan, then the driver reports both "missing plan" and "exited with # non-zero status" errors. -am_parallel_tests=yes . ./defs || Exit 1 cat > foo.test <<END diff --git a/t/tap-more.sh b/t/tap-more.sh index 5c7b48769..5949e15a7 100755 --- a/t/tap-more.sh +++ b/t/tap-more.sh @@ -24,7 +24,6 @@ # correct test script(s) # - "make distcheck" works -am_parallel_tests=yes . ./defs || Exit 1 fetch_tap_driver diff --git a/t/tap-more2.sh b/t/tap-more2.sh index 3cefd5800..b34e3c18d 100755 --- a/t/tap-more2.sh +++ b/t/tap-more2.sh @@ -20,7 +20,6 @@ # - interactions with 'check_*' variables required='cc native' -am_parallel_tests=yes . ./defs || Exit 1 fetch_tap_driver diff --git a/t/tap-msg0-bailout.sh b/t/tap-msg0-bailout.sh index dc7cf36ae..09b232f2f 100755 --- a/t/tap-msg0-bailout.sh +++ b/t/tap-msg0-bailout.sh @@ -19,7 +19,6 @@ # of a "plan with skip" TAP plan # generally true! -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-msg0-directive.sh b/t/tap-msg0-directive.sh index 04d379071..cbd2fcee1 100755 --- a/t/tap-msg0-directive.sh +++ b/t/tap-msg0-directive.sh @@ -17,7 +17,6 @@ # TAP support: # - literal string "0" as a TODO or SKIP message -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-msg0-misc.sh b/t/tap-msg0-misc.sh index 6a515a8a8..06f400b78 100755 --- a/t/tap-msg0-misc.sh +++ b/t/tap-msg0-misc.sh @@ -18,7 +18,6 @@ # - literal "0" and "0.0" in a test description and a TODO/SKIP message # at the same time -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-msg0-planskip.sh b/t/tap-msg0-planskip.sh index 2706ac67d..c965ab243 100755 --- a/t/tap-msg0-planskip.sh +++ b/t/tap-msg0-planskip.sh @@ -18,7 +18,6 @@ # - literal strings "0" and "0.0" as the reason of the skip in a "TAP # plan with skip" (i.e., "1..0 # SKIP ..."). -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-msg0-result.sh b/t/tap-msg0-result.sh index 8c464c418..a2cc0a58d 100755 --- a/t/tap-msg0-result.sh +++ b/t/tap-msg0-result.sh @@ -17,7 +17,6 @@ # TAP support: # - the string "0" as a test description -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-negative-numbers.sh b/t/tap-negative-numbers.sh index 67ecb1e5e..11661a19b 100755 --- a/t/tap-negative-numbers.sh +++ b/t/tap-negative-numbers.sh @@ -18,7 +18,6 @@ # - don't spuriously recognize negative TAP result numbers, but correctly # interpret them as test descriptions instead -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-no-disable-hard-error.sh b/t/tap-no-disable-hard-error.sh index c95e20e97..5fa587d16 100755 --- a/t/tap-no-disable-hard-error.sh +++ b/t/tap-no-disable-hard-error.sh @@ -18,7 +18,6 @@ # - "Bail out!" magic and TAP parse errors are not disabled nor turned # into simple failures by the definition DISABLE_HARD_ERRORS. -am_parallel_tests=yes . ./defs || Exit 1 cat > Makefile.am << 'END' diff --git a/t/tap-no-merge-stdout-stderr.sh b/t/tap-no-merge-stdout-stderr.sh index 0236ef8ac..eb6b0807a 100755 --- a/t/tap-no-merge-stdout-stderr.sh +++ b/t/tap-no-merge-stdout-stderr.sh @@ -18,7 +18,6 @@ # - By default, TAP input is only from the stdout (and not the stderr) # of the test command. -am_parallel_tests=yes . ./defs || Exit 1 cat > Makefile.am << 'END' diff --git a/t/tap-no-spurious-numbers.sh b/t/tap-no-spurious-numbers.sh index 2fc993e01..4cdace02b 100755 --- a/t/tap-no-spurious-numbers.sh +++ b/t/tap-no-spurious-numbers.sh @@ -18,7 +18,6 @@ # - we shouldn't spuriously recognize as TAP result numbers what it # not, even if it seems pretty close -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-no-spurious.sh b/t/tap-no-spurious.sh index ac6e6687d..b9bca21fb 100755 --- a/t/tap-no-spurious.sh +++ b/t/tap-no-spurious.sh @@ -18,7 +18,6 @@ # - don't spuriously recognize lines that are "almost" TAP lines as # real TAP lines -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-not-ok-skip.sh b/t/tap-not-ok-skip.sh index 8cfffe2e4..f52127ce2 100755 --- a/t/tap-not-ok-skip.sh +++ b/t/tap-not-ok-skip.sh @@ -18,7 +18,6 @@ # - a "not ok # SKIP" line should count as a failure, for consistency # with the prove(1) utility. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-number-wordboundary.sh b/t/tap-number-wordboundary.sh index 7aa2c7f09..324adb627 100755 --- a/t/tap-number-wordboundary.sh +++ b/t/tap-number-wordboundary.sh @@ -18,7 +18,6 @@ # - TAP result numbers terminated by a non-whitespace "word boundary" # character are recognized -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-numbers-leading-zero.sh b/t/tap-numbers-leading-zero.sh index 345b31f0f..bbd0d0ece 100755 --- a/t/tap-numbers-leading-zero.sh +++ b/t/tap-numbers-leading-zero.sh @@ -17,7 +17,6 @@ # TAP support: # - how does TAP result numbers with leading zero fares? -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-numeric-description.sh b/t/tap-numeric-description.sh index b2f54f3b7..cd220a7d5 100755 --- a/t/tap-numeric-description.sh +++ b/t/tap-numeric-description.sh @@ -16,7 +16,6 @@ # TAP result lines whose description is a number. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-out-of-order.sh b/t/tap-out-of-order.sh index 8c62ea6b0..2a2ad9faf 100755 --- a/t/tap-out-of-order.sh +++ b/t/tap-out-of-order.sh @@ -17,7 +17,6 @@ # TAP support: # - out-of-order test results -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-passthrough-exit.sh b/t/tap-passthrough-exit.sh index 63c757b17..a39725225 100755 --- a/t/tap-passthrough-exit.sh +++ b/t/tap-passthrough-exit.sh @@ -19,7 +19,6 @@ # log file # See also related test 'tap-passthrough.test'. -am_parallel_tests=yes . ./defs || Exit 1 cat > Makefile.am << 'END' diff --git a/t/tap-passthrough.sh b/t/tap-passthrough.sh index 3b5863d96..77bb2f0d9 100755 --- a/t/tap-passthrough.sh +++ b/t/tap-passthrough.sh @@ -20,7 +20,6 @@ # - TAP errors are reported in the log file too # See also related test 'tap-passthrough-exit.test'. -am_parallel_tests=yes . ./defs || Exit 1 weirdchars=\''"\$@!&()[]<>#;,:.^?*/' diff --git a/t/tap-plan-corner.sh b/t/tap-plan-corner.sh index 52f813b4b..fcd26a5b5 100755 --- a/t/tap-plan-corner.sh +++ b/t/tap-plan-corner.sh @@ -17,7 +17,6 @@ # TAP support: # - some corner cases for TAP plan -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-plan-errors.sh b/t/tap-plan-errors.sh index 1b740599e..e0f6272e3 100755 --- a/t/tap-plan-errors.sh +++ b/t/tap-plan-errors.sh @@ -23,7 +23,6 @@ # and 'tap-skip-whole-badcount.test'. More checks about corner-cases # in TAP plans are performed in 'tap-plan-corner.test'. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-plan-leading-zero.sh b/t/tap-plan-leading-zero.sh index a86fbeef5..a3b78a5c5 100755 --- a/t/tap-plan-leading-zero.sh +++ b/t/tap-plan-leading-zero.sh @@ -19,7 +19,6 @@ # - TAP "SKIP" plans with multiple zeroes, as in "1..00 # SKIP" # This is consistent with the behaviour of the 'prove' utility. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-plan-malformed.sh b/t/tap-plan-malformed.sh index ef3580c5e..11173473c 100755 --- a/t/tap-plan-malformed.sh +++ b/t/tap-plan-malformed.sh @@ -17,7 +17,6 @@ # TAP support: a malformed TAP plan is not recognized. The checks in # here should be consistent with the behaviour of the 'prove' utility. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-plan-middle.sh b/t/tap-plan-middle.sh index e48d395f9..9c595c0e9 100755 --- a/t/tap-plan-middle.sh +++ b/t/tap-plan-middle.sh @@ -17,7 +17,6 @@ # TAP support: # - test plan preceding and/or following non-result TAP lines -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-plan-whitespace.sh b/t/tap-plan-whitespace.sh index 193da55d7..b1c1f2f93 100755 --- a/t/tap-plan-whitespace.sh +++ b/t/tap-plan-whitespace.sh @@ -17,7 +17,6 @@ # TAP support: # - plan line with trailing whitespace is recognized and handled correctly -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-plan.sh b/t/tap-plan.sh index cb47ccd36..5a707fa47 100755 --- a/t/tap-plan.sh +++ b/t/tap-plan.sh @@ -18,7 +18,6 @@ # - test scripts with the test plan at the beginning # - test scripts with the test plan at the end -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-planskip-and-logging.sh b/t/tap-planskip-and-logging.sh index 8e9da1e64..ce7912949 100755 --- a/t/tap-planskip-and-logging.sh +++ b/t/tap-planskip-and-logging.sh @@ -18,7 +18,6 @@ # - interactions between "TAP plan with SKIP" and logging of earlier or # later TAP or non-TAP text -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-planskip-badexit.sh b/t/tap-planskip-badexit.sh index fbb3b56e6..58ce0e7f6 100755 --- a/t/tap-planskip-badexit.sh +++ b/t/tap-planskip-badexit.sh @@ -18,7 +18,6 @@ # - an exit status != 0 of a test script causes an hard error, even if # the last line of output is a "SKIP plan" (e.g., "1..0 # SKIP"). -am_parallel_tests=yes . ./defs || Exit 1 echo TESTS = one.test two.test > Makefile.am diff --git a/t/tap-planskip-bailout.sh b/t/tap-planskip-bailout.sh index 7fb72e9d4..351aaba7e 100755 --- a/t/tap-planskip-bailout.sh +++ b/t/tap-planskip-bailout.sh @@ -18,7 +18,6 @@ # - a "Bail out!" directive causes an hard error, even if coming after # a "SKIP plan" (e.g., "1..0 # SKIP"). -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-planskip-case-insensitive.sh b/t/tap-planskip-case-insensitive.sh index 2fd7b0150..3afddec2c 100755 --- a/t/tap-planskip-case-insensitive.sh +++ b/t/tap-planskip-case-insensitive.sh @@ -17,7 +17,6 @@ # TAP support: # - "SKIP" keyword in a TAP plan is case-insensitive -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-planskip-late.sh b/t/tap-planskip-late.sh index 6c8d4f504..114b2c1fd 100755 --- a/t/tap-planskip-late.sh +++ b/t/tap-planskip-late.sh @@ -18,7 +18,6 @@ # - the special "plan with SKIP" can also be used "late" in the TAP # stream, i.e., preceded by non-TAP output or TAP diagnostic. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-planskip-later-errors.sh b/t/tap-planskip-later-errors.sh index a73dbce36..7bf3cb12c 100755 --- a/t/tap-planskip-later-errors.sh +++ b/t/tap-planskip-later-errors.sh @@ -17,7 +17,6 @@ # TAP support: # - TAP errors following a "TAP plan with SKIP" are still diagnosed. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-planskip-unplanned-corner.sh b/t/tap-planskip-unplanned-corner.sh index 6bd5d1ed0..bebd39877 100755 --- a/t/tap-planskip-unplanned-corner.sh +++ b/t/tap-planskip-unplanned-corner.sh @@ -18,7 +18,6 @@ # - test results seen in a TAP stream that has a "plan with SKIP" are # flagged as errors, even if all of them are "SKIP" results. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-planskip-unplanned.sh b/t/tap-planskip-unplanned.sh index 4aeb4de81..cfb1c609f 100755 --- a/t/tap-planskip-unplanned.sh +++ b/t/tap-planskip-unplanned.sh @@ -19,7 +19,6 @@ # been seen is an error # - any test result following a "plan with skip" is an error. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-planskip-whitespace.sh b/t/tap-planskip-whitespace.sh index c6aa7a758..582291123 100755 --- a/t/tap-planskip-whitespace.sh +++ b/t/tap-planskip-whitespace.sh @@ -18,7 +18,6 @@ # - normalization of whitespace in console testsuite progress associated # with a SKIP directive in the TAP plan -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-planskip.sh b/t/tap-planskip.sh index 80d951c88..fa0f2d835 100755 --- a/t/tap-planskip.sh +++ b/t/tap-planskip.sh @@ -17,7 +17,6 @@ # Basic TAP test protocol support: # - special plan format to skip all the tests in a script -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-realtime.sh b/t/tap-realtime.sh index d664250e5..bca8f70a4 100755 --- a/t/tap-realtime.sh +++ b/t/tap-realtime.sh @@ -22,7 +22,6 @@ # children, and is pretty hacky and complex; is there a better way to # accomplish the checks done here? -am_parallel_tests=yes . ./defs || Exit 1 cat >expect-check <<'END' diff --git a/t/tap-recheck.sh b/t/tap-recheck.sh index a2af0676c..2416c6a6e 100755 --- a/t/tap-recheck.sh +++ b/t/tap-recheck.sh @@ -17,7 +17,6 @@ # Test the 'recheck' target for TAP test protocol. # Keep in sync with 'test-driver-custom-multitest-recheck.test'. -am_parallel_tests=yes . ./defs || Exit 1 fetch_tap_driver diff --git a/t/tap-result-comment.sh b/t/tap-result-comment.sh index 7162df02a..21bc81030 100755 --- a/t/tap-result-comment.sh +++ b/t/tap-result-comment.sh @@ -17,7 +17,6 @@ # TAP support: # - non-directive comments in TAP results are kept verbatim -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-signal.tap b/t/tap-signal.tap index d35ee6ff3..42b19e529 100755 --- a/t/tap-signal.tap +++ b/t/tap-signal.tap @@ -17,7 +17,6 @@ # TAP support: # - a test script terminated by a signal causes an hard error -am_parallel_tests=yes . ./defs || Exit 1 fetch_tap_driver diff --git a/t/tap-test-number-0.sh b/t/tap-test-number-0.sh index 7df554c1a..7eb5e2ef0 100755 --- a/t/tap-test-number-0.sh +++ b/t/tap-test-number-0.sh @@ -18,7 +18,6 @@ # - a test result numbered as 0 is to be considered out-of-order # This is consistent with the behaviour of the 'prove' utility. -am_parallel_tests=yes . ./defs || Exit 1 if test $am_tap_implementation = perl; then diff --git a/t/tap-todo-skip-together.sh b/t/tap-todo-skip-together.sh index e91153238..31580ca6e 100755 --- a/t/tap-todo-skip-together.sh +++ b/t/tap-todo-skip-together.sh @@ -18,7 +18,6 @@ # - TODO and SKIP directives on the same line: the first one wins # See also related test 'tap-ambiguous-directive.test'. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-todo-skip-whitespace.sh b/t/tap-todo-skip-whitespace.sh index 9d7afb962..d36aa1364 100755 --- a/t/tap-todo-skip-whitespace.sh +++ b/t/tap-todo-skip-whitespace.sh @@ -18,7 +18,6 @@ # - normalization of whitespace in console testsuite progress associated # with TODO and SKIP directives -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-todo-skip.sh b/t/tap-todo-skip.sh index 87bf12b39..e03dc4e42 100755 --- a/t/tap-todo-skip.sh +++ b/t/tap-todo-skip.sh @@ -23,7 +23,6 @@ # - the reasons for TODO and SKIP, if present, are nicely printed in # the testsuite progress output -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-unplanned.sh b/t/tap-unplanned.sh index 38c51fc05..fef966303 100755 --- a/t/tap-unplanned.sh +++ b/t/tap-unplanned.sh @@ -17,7 +17,6 @@ # TAP support: # - unplanned tests are properly reported as errors -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-whitespace-normalization.sh b/t/tap-whitespace-normalization.sh index 227467441..a43d29a1f 100755 --- a/t/tap-whitespace-normalization.sh +++ b/t/tap-whitespace-normalization.sh @@ -20,7 +20,6 @@ # force us to tweak dozens of other tests (hopefully). # See also related test 'tap-todo-skip-whitespace.test'. -am_parallel_tests=yes . ./defs || Exit 1 cat > Makefile.am << 'END' diff --git a/t/tap-with-and-without-number.sh b/t/tap-with-and-without-number.sh index fc795f6f9..82889c290 100755 --- a/t/tap-with-and-without-number.sh +++ b/t/tap-with-and-without-number.sh @@ -19,7 +19,6 @@ # - tests without explicit number get automatically numbered in the # testsuite progress output on console -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/tap-xfail-tests.sh b/t/tap-xfail-tests.sh index 610779201..27c1804e4 100755 --- a/t/tap-xfail-tests.sh +++ b/t/tap-xfail-tests.sh @@ -17,7 +17,6 @@ # TAP and $(XFAIL_TESTS): test results without directives are turned from # PASS to XPASS and from FAIL to XFAIL; other results are unchanged. -am_parallel_tests=yes . ./defs || Exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" diff --git a/t/test-driver-acsubst.sh b/t/test-driver-acsubst.sh index 7df66ae77..e384ac792 100755 --- a/t/test-driver-acsubst.sh +++ b/t/test-driver-acsubst.sh @@ -17,7 +17,6 @@ # parallel-tests: # - LOG_DRIVER variables can be AC_SUBST'd -am_parallel_tests=yes . ./defs || Exit 1 mkdir test-drivers diff --git a/t/test-driver-cond.sh b/t/test-driver-cond.sh index ac0b3f171..5538105b5 100755 --- a/t/test-driver-cond.sh +++ b/t/test-driver-cond.sh @@ -18,7 +18,6 @@ # - Automake can correctly handle conditionals contents for the # LOG_DRIVER variables. -am_parallel_tests=yes . ./defs || Exit 1 cp "$am_testauxdir"/trivial-test-driver . \ diff --git a/t/test-driver-create-log-dir.sh b/t/test-driver-create-log-dir.sh index bfca0b938..dc8e6811f 100755 --- a/t/test-driver-create-log-dir.sh +++ b/t/test-driver-create-log-dir.sh @@ -18,7 +18,6 @@ # e.g., 'sub/foo.log'), the Automake test harness must ensure that # directory exists before calling any custom test driver. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/test-driver-custom-multitest-recheck.sh b/t/test-driver-custom-multitest-recheck.sh index af3d8518a..504666e40 100755 --- a/t/test-driver-custom-multitest-recheck.sh +++ b/t/test-driver-custom-multitest-recheck.sh @@ -22,7 +22,6 @@ # and 'parallel-tests-recheck-override.test'. # Keep in sync with 'tap-recheck.test'. -am_parallel_tests=yes . ./defs || Exit 1 cp "$am_testauxdir"/trivial-test-driver . \ diff --git a/t/test-driver-custom-multitest-recheck2.sh b/t/test-driver-custom-multitest-recheck2.sh index 9eb8f8d37..c1df52b52 100755 --- a/t/test-driver-custom-multitest-recheck2.sh +++ b/t/test-driver-custom-multitest-recheck2.sh @@ -19,7 +19,6 @@ # check that this still works when we override $(TESTS) at make runtime. # See also related tests 'test-driver-custom-multitest-recheck.test'. -am_parallel_tests=yes . ./defs || Exit 1 cp "$am_testauxdir"/trivial-test-driver . \ diff --git a/t/test-driver-custom-multitest.sh b/t/test-driver-custom-multitest.sh index caf6a079a..19acd9860 100755 --- a/t/test-driver-custom-multitest.sh +++ b/t/test-driver-custom-multitest.sh @@ -19,7 +19,6 @@ # only checks implementation details in Automake's custom test drivers # support, but also serves as a "usability test" for our APIs. -am_parallel_tests=yes . ./defs || Exit 1 cp "$am_testauxdir"/trivial-test-driver . \ diff --git a/t/test-driver-custom-no-extra-driver.sh b/t/test-driver-custom-no-extra-driver.sh index 5f66f6dde..1d8553bae 100755 --- a/t/test-driver-custom-no-extra-driver.sh +++ b/t/test-driver-custom-no-extra-driver.sh @@ -18,7 +18,6 @@ # installed or referenced if it's not used, i.e., if the user has # defined his own '*LOG_DRIVER' variables. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac <<'END' diff --git a/t/test-driver-custom-xfail-tests.sh b/t/test-driver-custom-xfail-tests.sh index d883b73e3..f260480bf 100755 --- a/t/test-driver-custom-xfail-tests.sh +++ b/t/test-driver-custom-xfail-tests.sh @@ -16,7 +16,6 @@ # Custom test drivers: "abstract" XFAIL_TESTS support. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac <<'END' diff --git a/t/test-driver-custom.sh b/t/test-driver-custom.sh index 60ce07418..ce4a7fcdf 100755 --- a/t/test-driver-custom.sh +++ b/t/test-driver-custom.sh @@ -16,7 +16,6 @@ # Custom test drivers: per-extension test drivers. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/test-driver-fail.sh b/t/test-driver-fail.sh index f1c3df80f..f53e58fa8 100755 --- a/t/test-driver-fail.sh +++ b/t/test-driver-fail.sh @@ -22,7 +22,6 @@ # (like our dummy one in this test) might leave around a test log even # in case of internal failures. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac <<'END' diff --git a/t/test-driver-is-distributed.sh b/t/test-driver-is-distributed.sh index 78076cf76..c6e83feb3 100755 --- a/t/test-driver-is-distributed.sh +++ b/t/test-driver-is-distributed.sh @@ -19,7 +19,6 @@ # defined in a subdir Makefile am_create_testdir=empty -am_parallel_tests=yes . ./defs || Exit 1 ocwd=`pwd` || fatal_ "getting current working directory" diff --git a/t/test-driver-strip-vpath.sh b/t/test-driver-strip-vpath.sh index f7adb674c..00acb7c42 100755 --- a/t/test-driver-strip-vpath.sh +++ b/t/test-driver-strip-vpath.sh @@ -17,7 +17,6 @@ # Custom test drivers: check that the test name passed to the test # driver has any VPATH prefix stripped. -am_parallel_tests=yes . ./defs || Exit 1 ocwd=`pwd` || fatal_ "cannot get current working directory" diff --git a/t/test-extensions-cond.sh b/t/test-extensions-cond.sh index 81808033a..e081d797b 100755 --- a/t/test-extensions-cond.sh +++ b/t/test-extensions-cond.sh @@ -16,7 +16,6 @@ # Expose bug in conditional definition of TEST_EXTENSIONS. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/test-extensions.sh b/t/test-extensions.sh index 13c42eb43..481d1e35c 100755 --- a/t/test-extensions.sh +++ b/t/test-extensions.sh @@ -18,7 +18,6 @@ # and do not diagnose valid (albeit more unusual) ones. # See automake bug#9400. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac <<'END' diff --git a/t/test-harness-vpath-rewrite.sh b/t/test-harness-vpath-rewrite.sh index f0f71c66f..0058b6dc7 100755 --- a/t/test-harness-vpath-rewrite.sh +++ b/t/test-harness-vpath-rewrite.sh @@ -17,7 +17,6 @@ # Check that our concurrent test harness is not subject to spurious VPATH # rewrites. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/test-log.sh b/t/test-log.sh index 2a4d59910..3e14f1066 100755 --- a/t/test-log.sh +++ b/t/test-log.sh @@ -22,7 +22,6 @@ # - VERBOSE environment variable support # Keep in sync with 'tap-log.test'. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac <<END diff --git a/t/test-logs-repeated.sh b/t/test-logs-repeated.sh index d75bbcb15..30aefca67 100755 --- a/t/test-logs-repeated.sh +++ b/t/test-logs-repeated.sh @@ -20,7 +20,6 @@ # different test scripts don't end up sharing the same log file. # (Automake itself is such a project, BTW ;-) -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac <<END diff --git a/t/test-metadata-global-log.sh b/t/test-metadata-global-log.sh index 5d02e7793..77500037c 100755 --- a/t/test-metadata-global-log.sh +++ b/t/test-metadata-global-log.sh @@ -20,7 +20,6 @@ # with the use of the reStructuredText field ':copy-in-global-log:' in # the associated '.trs' files. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/test-metadata-global-result.sh b/t/test-metadata-global-result.sh index 9c0fd481c..3d8759a27 100755 --- a/t/test-metadata-global-result.sh +++ b/t/test-metadata-global-result.sh @@ -18,7 +18,6 @@ # "global test result" in '*.trs' files, as documented in the automake # manual. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/test-metadata-recheck.sh b/t/test-metadata-recheck.sh index 0a7a7ccb4..88747458c 100755 --- a/t/test-metadata-recheck.sh +++ b/t/test-metadata-recheck.sh @@ -17,7 +17,6 @@ # Test the "make recheck" semantics for custom test drivers, as documented # in the Automake manual. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/test-metadata-results.sh b/t/test-metadata-results.sh index 1cafbb562..ca69b9385 100755 --- a/t/test-metadata-results.sh +++ b/t/test-metadata-results.sh @@ -17,7 +17,6 @@ # Parallel testsuite harness: check APIs for the registering of test # results in '*.trs' files, as documented in the automake manual. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/test-missing.sh b/t/test-missing.sh index 7ede22425..115aed93a 100755 --- a/t/test-missing.sh +++ b/t/test-missing.sh @@ -16,7 +16,6 @@ # parallel-tests: non-existent scripts listed in TESTS get diagnosed. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/test-trs-basic.sh b/t/test-trs-basic.sh index 43e3854fd..896db04d1 100755 --- a/t/test-trs-basic.sh +++ b/t/test-trs-basic.sh @@ -18,7 +18,6 @@ # - creation and removal of '.trs' auxiliary files # - check some internals regarding the use of '.trs' files. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac <<END diff --git a/t/test-trs-recover-parallel.sh b/t/test-trs-recover-parallel.sh index 0a03bdfdf..fd8d18312 100755 --- a/t/test-trs-recover-parallel.sh +++ b/t/test-trs-recover-parallel.sh @@ -17,7 +17,6 @@ # Check parallel harness features: # - recovery from deleted '.log' and '.trs' files, with parallel make -am_parallel_tests=yes . ./defs || Exit 1 all= log= trs= diff --git a/t/test-trs-recover.sh b/t/test-trs-recover.sh index 25cb36368..e09d7f866 100755 --- a/t/test-trs-recover.sh +++ b/t/test-trs-recover.sh @@ -19,7 +19,6 @@ # This test is complex and tricky, but that's acceptable since we are # testing semantics that are potentially complex and tricky. -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac <<END diff --git a/t/tests-environment-and-log-compiler.sh b/t/tests-environment-and-log-compiler.sh index 0e9d6e737..65855ce8a 100755 --- a/t/tests-environment-and-log-compiler.sh +++ b/t/tests-environment-and-log-compiler.sh @@ -18,7 +18,6 @@ # by TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT in LOG_COMPILER and # LOG_FLAGS (for tests both with and without registered extensions). -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/tests-environment-backcompat.sh b/t/tests-environment-backcompat.sh index 61b2728cf..93643d11d 100755 --- a/t/tests-environment-backcompat.sh +++ b/t/tests-environment-backcompat.sh @@ -19,7 +19,7 @@ # be run by (with the parallel-tests driver one should use LOG_COMPILER # for this). The behaviour tested here is also documented in the manual. -am_parallel_tests=no +am_serial_tests=yes . ./defs || Exit 1 cat >> configure.ac <<END diff --git a/t/tests-environment-fd-redirect.sh b/t/tests-environment-fd-redirect.sh index d62e537d6..6c42fd4ea 100755 --- a/t/tests-environment-fd-redirect.sh +++ b/t/tests-environment-fd-redirect.sh @@ -26,7 +26,6 @@ # and the following CC:ed thread on bug-autoconf list: # <http://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00002.html> -am_parallel_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/tests-environment.sh b/t/tests-environment.sh index 27cd458f2..62ca4ee9c 100755 --- a/t/tests-environment.sh +++ b/t/tests-environment.sh @@ -16,6 +16,7 @@ # "Simple Tests" testsuite driver: check TESTS_ENVIRONMENT support. +am_serial_tests=yes . ./defs || Exit 1 cat >> configure.ac << 'END' diff --git a/t/testsuite-recheck-speed.sh b/t/testsuite-recheck-speed.sh index 9b37262c8..50cc03ba2 100755 --- a/t/testsuite-recheck-speed.sh +++ b/t/testsuite-recheck-speed.sh @@ -19,7 +19,6 @@ # FIXME: performance is too low, and FAIL accordingly; it just offers an # FIXME: easy way to verify how effective a performance optimization is. -am_parallel_tests=yes . ./defs || Exit 1 count=5000 diff --git a/t/testsuite-summary-count-many.sh b/t/testsuite-summary-count-many.sh index ff38097e4..b101206bb 100755 --- a/t/testsuite-summary-count-many.sh +++ b/t/testsuite-summary-count-many.sh @@ -19,7 +19,6 @@ # Incidentally, this test also checks that the testsuite summary doesn't # give any bug-report address if it's not defined. -am_parallel_tests=yes . ./defs || Exit 1 for s in trivial-test-driver extract-testsuite-summary.pl; do diff --git a/t/testsuite-summary-reference-log.sh b/t/testsuite-summary-reference-log.sh index 1d4238bcf..85049be51 100755 --- a/t/testsuite-summary-reference-log.sh +++ b/t/testsuite-summary-reference-log.sh @@ -17,7 +17,6 @@ # Check that the global testsuite log file referenced in the testsuite # summary and in the global testsuite log itself is correct. -am_parallel_tests=yes . ./defs || Exit 1 mv configure.ac configure.stub diff --git a/t/testsuite-summary-speed.sh b/t/testsuite-summary-speed.sh index 4d18c61e4..a11bb8ef7 100755 --- a/t/testsuite-summary-speed.sh +++ b/t/testsuite-summary-speed.sh @@ -20,7 +20,6 @@ # FIXME: performance is too low, and FAIL accordingly; it just offers # FIXME: an easy way verify how effective a performance optimization is. -am_parallel_tests=yes . ./defs || Exit 1 count=10000 diff --git a/t/yacc-clean-cxx.sh b/t/yacc-clean-cxx.sh index d8ee1c65f..399f02657 100755 --- a/t/yacc-clean-cxx.sh +++ b/t/yacc-clean-cxx.sh @@ -68,7 +68,8 @@ cat > sub1/parsefoo.yxx << 'END' %{ // This file should contain valid C++ but invalid C. #include <cstdio> -int yylex (void) { return (getchar ()); } +// "std::" qualification required by Sun C++ 5.9. +int yylex (void) { return std::getchar (); } void yyerror (const char *s) { return; } %} %% diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh index a888f87e1..df4158e78 100755 --- a/t/yacc-cxx.sh +++ b/t/yacc-cxx.sh @@ -46,7 +46,8 @@ cat > parse1.yy << 'END' // Valid C++, but deliberately invalid C. #include <cstdio> #include <cstdlib> -int yylex (void) { return getchar (); } +// "std::" qualification required by Sun C++ 5.9. +int yylex (void) { return std::getchar (); } void yyerror (const char *s) { return; } %} %% |