Partially revert previous patch.

* lib/autotest/general.m4 (AT_INIT) <serial testing>: Changing
at_jobs here breaks output if -j2 was requested but shell is
insufficient to support parallel testing.
Reported by Ralf Wildenhues.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index aba65972cac8f3a87b6739a673bb2b33334ac063..e44f78a99c7784c5e31a029ab1f8ce75a46a24c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-07-21  Eric Blake  <eblake@redhat.com>
 
+       Partially revert previous patch.
+       * lib/autotest/general.m4 (AT_INIT) <serial testing>: Changing
+       at_jobs here breaks output if -j2 was requested but shell is
+       insufficient to support parallel testing.
+       Reported by Ralf Wildenhues.
+
        Minor testsuite size reduction.
        * lib/autotest/general.m4 (AT_INIT) <serial testing>: Ensure
        at_jobs is 1.

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 060dbba5e63e28f3615b25cfa4e4f6b9694037a4..ba576e3d4482bd00d42d85028d9f5231c1c4cf9d 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1458,7 +1458,6 @@ dnl           kill -13 $$
   wait
 else
   # Run serially, avoid forks and other potential surprises.
-  at_jobs=1
   for at_group in $at_groups; do
     at_fn_group_prepare
     if cd "$at_group_dir" &&