diff options
| author | psmith <> | 2007-07-14 02:57:46 +0000 |
|---|---|---|
| committer | psmith <> | 2007-07-14 02:57:46 +0000 |
| commit | 04c237ec14a72c85abc2c9345522ca46d878bedd (patch) | |
| tree | 4e10b638090d02f36676d215ee4f40fdcb7c81af /tests/scripts | |
| parent | bb5d2b5da39f0c65c5cbd5537e1a7ba824025ec9 (diff) | |
| download | make-04c237ec14a72c85abc2c9345522ca46d878bedd.tar.gz | |
Fix Savannah bug #20452.
Add a new feature to the test suite suggested by Icarus Sparry:
set a timer before invoking a test, so that if it loops infinitely we
will wake up and have a chance to kill the process and continue.
Diffstat (limited to 'tests/scripts')
| -rw-r--r-- | tests/scripts/features/parallelism | 3 | ||||
| -rw-r--r-- | tests/scripts/options/dash-l | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/scripts/features/parallelism b/tests/scripts/features/parallelism index abe49a5d..432c0889 100644 --- a/tests/scripts/features/parallelism +++ b/tests/scripts/features/parallelism @@ -69,6 +69,7 @@ unlink('1.inc', '2.inc'); # function in an exported recursive variable. I added some code to check # for this situation and print a message if it occurred. This test used # to trigger this code when I added it but no longer does after the fix. +# We have to increase the timeout from the default (5s) on this test. run_make_test(" export HI = \$(shell \$(\$\@.CMD)) @@ -79,7 +80,7 @@ second.CMD = $sleep_command 4; echo hi all: first second first second: ; \@echo \$\@; $sleep_command 1; echo \$\@", - '-j2', "first\nfirst\nsecond\nsecond"); + '-j2', "first\nfirst\nsecond\nsecond", 0, 7); # Michael Matz <matz@suse.de> reported a bug where if make is running in # parallel without -k and two jobs die in a row, but not too close to each diff --git a/tests/scripts/options/dash-l b/tests/scripts/options/dash-l index 58216f9f..0b0f196f 100644 --- a/tests/scripts/options/dash-l +++ b/tests/scripts/options/dash-l @@ -45,7 +45,8 @@ close(MAKEFILE); $mkoptions = "-l 0.0001"; $mkoptions .= " -j 4" if ($parallel_jobs); -&run_make_with_options($makefile, $mkoptions, &get_logfile); +# We have to wait longer than the default (5s). +&run_make_with_options($makefile, $mkoptions, &get_logfile, 0, 8); $slurp = &read_file_into_string (&get_logfile(1)); if ($slurp !~ /cannot enforce load limit/) { |