Fix assertion failure on test timeout

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index cf798fb84f..523028da4a 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 e185281eaf..0582230aec 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.  */