maint: adjustments to recent timeout change

* .gitignore: Add /lib/fenv.h to ignore list.
* tests/timeout/timeout-parameters.sh: Use a sleep length of 10s
to be consistent with the pattern where we use this larger time
when it does not slow down a test, but also provides protection
against a hung test, and better avoidance of false failures due
to races on very loaded systems.  Also fix the setting of FAIL.
* tests/timeout/timeout-large-parameters.sh: Remove duplicated test.

diff --git a/.gitignore b/.gitignore
index f4a17ad0443c05bca76ed09f6cc08a3a4225e560..4dc39ae551c58cbde21cb461db4dc598c974aa74 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,7 @@
 /lib/errno.h
 /lib/error.h
 /lib/fcntl.h
+/lib/fenv.h
 /lib/float.h
 /lib/fnmatch.h
 /lib/getopt-cdefs.h

diff --git a/tests/timeout/timeout-large-parameters.sh b/tests/timeout/timeout-large-parameters.sh
index a5395d153f70250122c80fb06816567f976f5eb2..5669810e8ab319cc56e6da63a54c9b3743c883f9 100755 (executable)
--- a/tests/timeout/timeout-large-parameters.sh
+++ b/tests/timeout/timeout-large-parameters.sh
@@ -43,7 +43,4 @@ timeout 2.34e+5d sleep 0 || fail=1
 timeout $LDBL_MAX sleep 0 || fail=1
 returns_ 125 timeout -- -$LDBL_MAX sleep 0 || fail=1
 
-# Ensure underflow times out immediately
-returns_ 124 timeout 1e-5000 sleep 10 || fail=1
-
 Exit $fail

diff --git a/tests/timeout/timeout-parameters.sh b/tests/timeout/timeout-parameters.sh
index 408846262215c8e3c1189fbfc36d86eb15db93c6..c4b2202b41c142828740fc12e3b89f1ace7e454d 100755 (executable)
--- a/tests/timeout/timeout-parameters.sh
+++ b/tests/timeout/timeout-parameters.sh
@@ -41,7 +41,7 @@ timeout 10.34 sleep 0 || fail=1
 timeout 9.999999999 sleep 0 || fail=1
 
 # round underflow up to 1 ns
-returns_ 124 timeout 1e-10000 sleep 1 || fail
+returns_ 124 timeout 1e-10000 sleep 10 || fail=1
 
 # invalid signal spec
 returns_ 125 timeout --signal=invalid 1 sleep 0 || fail=1