github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-01-01 07:50:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Increase the test framework timeout from 5s to 60s

Browse Source 
It seems that some of the test environments hit the 5s timeout on
some tests.  Since it doesn't really matter, as long as we don't
hang forever, increase the timeout to 60s.

* tests/test_driver.pl: Increase $test_timout to 60.  We don't need
to handle VMS timeouts specially anymore.
* tests/scripts/features/parallelism: We don't need to override the
default timeout anymore.
* tests/scripts/features/patternrules: Remove confusing comment.
This commit is contained in:
Paul Smith 2022-10-25 14:44:26 -04:00
parent f8401ad28b
commit 04f0d8427f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/scripts/features/parallelism
View File

@ -75,7 +75,6 @@ rmfiles(qw(ONE.inc TWO.inc THREE.inc ONE TWO THREE 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(q!
export HI = $(shell $($@.CMD))
@ -86,7 +85,7 @@ second.CMD = #HELPER# sleep 4
all: first second
first second: ; @#HELPER# out $@ sleep 1 out $@!,
'-j2', "first\nsleep 1\nfirst\nsecond\nsleep 1\nsecond", 0, 7);
'-j2', "first\nsleep 1\nfirst\nsecond\nsleep 1\nsecond", 0);
# 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

2
tests/scripts/features/patternrules
View File

@ -196,7 +196,7 @@ all: foo.x foo-mt.x
'', "one\ntwo");
# Test pattern rules building the same targets
# See SV 54233. Rely on our standard test timeout to break the loop
# See SV 54233.
touch('a.c');

7
tests/test_driver.pl
View File

@ -57,8 +57,8 @@ $pathsep = undef;
$test_passed = 1;
# Timeout in seconds. If the test takes longer than this we'll fail it.
$test_timeout = 5;
$test_timeout = 10 if $^O eq 'VMS';
# This is to prevent hung tests.
$test_timeout = 60;
$diff_name = undef;
@ -859,7 +859,8 @@ sub compare_output
$slurp_mod =~ s,\r\n,\n,gs;
$answer_matched = ($slurp_mod eq $answer_mod);
if ($^O eq 'VMS') {
if (!$answer_matched && $^O eq 'VMS') {
# VMS has extra blank lines in output sometimes.
# Ticket #41760