diff options
| author | Paul Smith <psmith@gnu.org> | 2022-10-25 14:44:26 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2022-10-25 14:44:26 -0400 |
| commit | 04f0d8427f590b8eafa49c97f96fd954778c1871 (patch) | |
| tree | c8a3fff297285d368b6e25c1e8372c91be1ae424 /tests/test_driver.pl | |
| parent | f8401ad28b0e74a11825332b939ce92b8c8ea2dc (diff) | |
| download | make-git-04f0d8427f590b8eafa49c97f96fd954778c1871.tar.gz | |
Increase the test framework timeout from 5s to 60s
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.
Diffstat (limited to 'tests/test_driver.pl')
| -rw-r--r-- | tests/test_driver.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/test_driver.pl b/tests/test_driver.pl index 32772f4a..964d3908 100644 --- a/tests/test_driver.pl +++ b/tests/test_driver.pl @@ -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 |