Fix hang with `testsuite -k notmatched'.

* lib/autotest/general.m4: Do not reset $at_jobs if it is equal
to one.  Fixes hang with `-k notmatched'.

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

diff --git a/ChangeLog b/ChangeLog
index dbba2f8830d7116b7a50471f0f38401506f14ce4..fd51e8097aedd40143e9dbd4c751e02b6be2cfe7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix hang with `testsuite -k notmatched'.
+       * lib/autotest/general.m4: Do not reset $at_jobs if it is equal
+       to one.  Fixes hang with `-k notmatched'.
+
 2008-10-02  Eric Blake  <ebb9@byu.net>
 
        Document more binary file portability traps.

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 4683df492c1fe4f225f08921eefa021c4e60d0a7..be135c18ebdd4473ef3297d900cf2c0fb8de22d6 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1018,7 +1018,8 @@ 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_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; then
+if test $at_jobs -ne 1 &&
+   { test $at_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; }; then
   at_jobs=$at_max_jobs
 fi