aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2016-12-15 16:41:04 +0100
committerAndreas Schwab <schwab@suse.de>2016-12-15 17:25:12 +0100
commit67f779f1ead0bf38d1ca0e882e20c7ce0c03c204 (patch)
tree860f2f038c201d51412c617f79b207a9c91e4df9
parent9ce4ac64b234c976ae56061afd5774896c5513c9 (diff)
downloadglibc-67f779f1ead0bf38d1ca0e882e20c7ce0c03c204.zip
glibc-67f779f1ead0bf38d1ca0e882e20c7ce0c03c204.tar.gz
glibc-67f779f1ead0bf38d1ca0e882e20c7ce0c03c204.tar.bz2
Fix assertion failure on test timeout
-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 cf798fb..523028d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-15 Andreas Schwab <schwab@suse.de>
+
+ * support/support_test_main.c (support_test_main): Don't shadow
+ file-local variable test_pid.
+
2016-12-15 Joseph Myers <joseph@codesourcery.com>
[BZ #20947]
diff --git a/support/support_test_main.c b/support/support_test_main.c
index e185281..0582230 100644
--- a/support/support_test_main.c
+++ b/support/support_test_main.c
@@ -307,7 +307,7 @@ support_test_main (int argc, char **argv, const struct test_config *config)
- set up the timer
- fork and execute the function. */
- pid_t test_pid = fork ();
+ test_pid = fork ();
if (test_pid == 0)
{
/* This is the child. */