From: Andreas Schwab <schwab@suse.de>
Date: Thu, 15 Dec 2016 15:41:04 +0000 (+0100)
Subject: Fix assertion failure on test timeout
X-Git-Tag: glibc-2.25~199
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67f779f1ead0bf38d1ca0e882e20c7ce0c03c204;p=thirdparty%2Fglibc.git

Fix assertion failure on test timeout
---

diff --git a/ChangeLog b/ChangeLog
index cf798fb84f0..523028da4a2 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 e185281eaf2..0582230aecc 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.  */