Fix assertion failure on test timeout

diff --git a/ChangeLog b/ChangeLog
index cf798fb84f0cf01558e2ddfad25bf4345c94646b..523028da4a253a311c683fb81efb0abfe9f35865 100644 (file)
--- 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 e185281eaf2cdff6adffbc46946ed23232ac1d55..0582230aecc971fc4b838d487c6e883f07901788 100644 (file)
--- 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.  */