Fix more testsuite hang corner cases.

* lib/autotest/general.m4: Use the serial code path if no test
is to be run.
* tests/autotest.at (parallel test execution): Test -j and -jN
with `-k notmatched'.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index fd51e8097aedd40143e9dbd4c751e02b6be2cfe7..4ccc626a9e8d462cc5c312d63175b866a0d30eaf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix more testsuite hang corner cases.
+       * lib/autotest/general.m4: Use the serial code path if no test
+       is to be run.
+       * tests/autotest.at (parallel test execution): Test -j and -jN
+       with `-k notmatched'.
+
 2008-10-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Fix hang with `testsuite -k notmatched'.

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index be135c18ebdd4473ef3297d900cf2c0fb8de22d6..f1966cec807375745b4aa0f8b2929ba5002ea654 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1018,6 +1018,9 @@ rm -f "$at_suite_dir/at-source-lines"
 
 # Set number of jobs for `-j'; avoid more jobs than test groups.
 set X $at_groups; shift; at_max_jobs=$[@%:@]
+if test $at_max_jobs -eq 0; then
+  at_jobs=1
+fi
 if test $at_jobs -ne 1 &&
    { test $at_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; }; then
   at_jobs=$at_max_jobs

diff --git a/tests/autotest.at b/tests/autotest.at
index a20c4acf551df823e70e4d19ddc393c97bbff0ed..3547ee41cff0841f84f2153e5f877be6f7995cc9 100644 (file)
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -846,6 +846,9 @@ AT_CHECK([grep -c '^.\{53\}ok' stdout], [], [1
 AT_CHECK([$CONFIG_SHELL ./micro-suite -j3 3], [], [stdout])
 AT_CHECK([grep -c '^.\{53\}ok' stdout], [], [1
 ])
+# Not even with zero tests:
+AT_CHECK([$CONFIG_SHELL ./micro-suite -j -k nomatch], [], [ignore])
+AT_CHECK([$CONFIG_SHELL ./micro-suite -j3 -k nomatch], [], [ignore])
 
 # The parallel scheduler requires mkfifo to work.
 AT_CHECK([mkfifo fifo || exit 77])