summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2016-12-10 16:10:53 +0100
committerAndreas Schwab <schwab@linux-m68k.org>2016-12-10 16:22:01 +0100
commitfea34d51e03ec5ebf9b25cb3010751782bf27fb1 (patch)
treef34ea1646fd1fb9f822e958683d7cdb33c5f6388
parent0abbe7cd700951082b314182a0958d65238297ef (diff)
downloadglibc-fea34d51e03ec5ebf9b25cb3010751782bf27fb1.tar.gz
glibc-fea34d51e03ec5ebf9b25cb3010751782bf27fb1.tar.xz
glibc-fea34d51e03ec5ebf9b25cb3010751782bf27fb1.zip
Fix testsuite timeout handling
-rw-r--r--ChangeLog5
-rw-r--r--support/support_test_main.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a9191afaf..5d51e9ac29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-10  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* support/support_test_main.c (support_test_main): Use correct
+	timeout.
+
 2016-12-09  Carlos O'Donell  <carlos@redhat.com>
 	    Florian Weimer  <fweimer@redhat.com>
 
diff --git a/support/support_test_main.c b/support/support_test_main.c
index 72771bf101..e185281eaf 100644
--- a/support/support_test_main.c
+++ b/support/support_test_main.c
@@ -338,7 +338,7 @@ support_test_main (int argc, char **argv, const struct test_config *config)
 
   /* Set timeout.  */
   signal (SIGALRM, signal_handler);
-  alarm (config->timeout * timeoutfactor);
+  alarm (timeout * timeoutfactor);
 
   /* Make sure we clean up if the wrapper gets interrupted.  */
   signal (SIGINT, signal_handler);