From: Ralf Wildenhues Date: Thu, 2 Oct 2008 18:44:22 +0000 (+0200) Subject: Fix hang with `testsuite -k notmatched'. X-Git-Tag: v2.63b~288 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d8609399d28e4736bbb2860812bfdafab50ef97;p=thirdparty%2Fautoconf.git 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 --- diff --git a/ChangeLog b/ChangeLog index dbba2f883..fd51e8097 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-10-02 Ralf Wildenhues + + 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 Document more binary file portability traps. diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4 index 4683df492..be135c18e 100644 --- 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