GNU C Library master sources branch master updated. glibc-2.21-260-gb0b88ab

[roland at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  b0b88abc1c138923bd1638560c73a3ced227f1d1 (commit)
      from  2902af1631c0c74c2f0c0edd7a85a523370e5027 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b0b88abc1c138923bd1638560c73a3ced227f1d1

commit b0b88abc1c138923bd1638560c73a3ced227f1d1
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Apr 9 11:15:17 2015 -0700

    Make test-skeleton.c grok TEST_DIRECT magic environment variable.

diff --git a/ChangeLog b/ChangeLog
index 30dc4da..03fbb7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-04-09  Roland McGrath  <roland@hack.frob.com>
+
+	* test-skeleton.c (TIMEOUT): Move #define to top level.
+	(main): Grok environment variable TEST_DIRECT.  If set, print
+	test expectation details into that file and then behave as if
+	given --direct.
+
 2015-04-09  Florian Weimer  <fweimer@redhat.com>
 
 	* malloc/tst-scratch_buffer.c (do_test): Suppress truncation
diff --git a/test-skeleton.c b/test-skeleton.c
index 6a7fc42..7a8ddfa 100644
--- a/test-skeleton.c
+++ b/test-skeleton.c
@@ -45,6 +45,11 @@
 # define TEST_DATA_LIMIT (64 << 20) /* Data limit (bytes) to run with.  */
 #endif
 
+#ifndef TIMEOUT
+  /* Default timeout is two seconds.  */
+# define TIMEOUT 2
+#endif
+
 #define OPT_DIRECT 1000
 #define OPT_TESTDIR 1001
 
@@ -293,7 +298,7 @@ main (int argc, char *argv[])
   /* Make sure we see all message, even those on stdout.  */
   setvbuf (stdout, NULL, _IONBF, 0);
 
-  /* make sure temporary files are deleted.  */
+  /* Make sure temporary files are deleted.  */
   atexit (delete_temp_files);
 
   /* Correct for the possible parameters.  */
@@ -306,6 +311,46 @@ main (int argc, char *argv[])
   PREPARE (argc, argv);
 #endif
 
+  const char *envstr_direct = getenv ("TEST_DIRECT");
+  if (envstr_direct != NULL)
+    {
+      FILE *f = fopen (envstr_direct, "w");
+      if (f == NULL)
+        {
+          printf ("cannot open TEST_DIRECT output file '%s': %m\n",
+                  envstr_direct);
+          exit (1);
+        }
+
+      fprintf (f, "timeout=%u\ntimeoutfactor=%u\n", TIMEOUT, timeoutfactor);
+#ifdef EXPECTED_STATUS
+      fprintf (f, "exit=%u\n", EXPECTED_STATUS);
+#endif
+#ifdef EXPECTED_SIGNAL
+      switch (EXPECTED_SIGNAL)
+        {
+        default: abort ();
+# define init_sig(signo, name, text) \
+        case signo: fprintf (f, "signal=%s\n", name); break;
+# include <siglist.h>
+# undef init_sig
+        }
+#endif
+
+      if (temp_name_list != NULL)
+        {
+          fprintf (f, "temp_files=(\n");
+          for (struct temp_name_list *n = temp_name_list;
+               n != NULL;
+               n = (struct temp_name_list *) n->q.q_forw)
+            fprintf (f, "  '%s'\n", n->name);
+          fprintf (f, ")\n");
+        }
+
+      fclose (f);
+      direct = 1;
+    }
+
   /* If we are not expected to fork run the function immediately.  */
   if (direct)
     return TEST_FUNCTION;
@@ -359,10 +404,6 @@ main (int argc, char *argv[])
     }
 
   /* Set timeout.  */
-#ifndef TIMEOUT
-  /* Default timeout is two seconds.  */
-# define TIMEOUT 2
-#endif
   signal (SIGALRM, signal_handler);
   alarm (TIMEOUT * timeoutfactor);
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    7 +++++++
 test-skeleton.c |   51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 53 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources