GNU C Library master sources branch master updated. glibc-2.22-407-gcf14556

jsm28@sourceware.org jsm28@sourceware.org
Thu Oct 15 22:29:00 GMT 2015


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  cf1455657ec916ecd78c9d2c3bcbbf6608e6c158 (commit)
      from  fadd2ad9cc36115440d50b0eae9299e65988917d (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=cf1455657ec916ecd78c9d2c3bcbbf6608e6c158

commit cf1455657ec916ecd78c9d2c3bcbbf6608e6c158
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Thu Oct 15 22:29:06 2015 +0000

    Do not leave files behind in /tmp from testing.
    
    I noticed that glibc testsuite runs left several files behind in /tmp
    (or TMPDIR, if different).  The problem was testcases that generate a
    template for mkstemp / mkstemp64, ending with XXXXXX, then pass that
    template to add_temp_file before calling mkstemp / mkstemp64, meaning
    that the template ending with XXXXXX is stored in the list of
    temporary files to delete (add_temp_file uses strdup so that the
    original string doesn't need to stay live), not the actual filename as
    determined by mkstemp / mkstemp64.  This patch fixes those tests to
    call add_temp_file later.
    
    Tested for x86_64 (that the files are no longer left behind by a
    testsuite run and the modified tests still pass).
    
    	* io/test-lfs.c (do_prepare): Do not call add_temp_file until
    	after mkstemp64.
    	* login/tst-utmp.c (do_prepare): Likewise.
    	* rt/tst-aio.c (do_prepare): Likewise.
    	* rt/tst-aio64.c (do_prepare): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 917c464..9465483 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-10-15  Joseph Myers  <joseph@codesourcery.com>
+
+	* io/test-lfs.c (do_prepare): Do not call add_temp_file until
+	after mkstemp64.
+	* login/tst-utmp.c (do_prepare): Likewise.
+	* rt/tst-aio.c (do_prepare): Likewise.
+	* rt/tst-aio64.c (do_prepare): Likewise.
+
 2015-10-15  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
 
 	* sysdeps/unix/sysv/linux/powerpc/elision-lock.c
diff --git a/io/test-lfs.c b/io/test-lfs.c
index b6ebae4..09310a4 100644
--- a/io/test-lfs.c
+++ b/io/test-lfs.c
@@ -56,7 +56,6 @@ do_prepare (int argc, char *argv[])
   name = malloc (name_len + sizeof ("/lfsXXXXXX"));
   mempcpy (mempcpy (name, test_dir, name_len),
            "/lfsXXXXXX", sizeof ("/lfsXXXXXX"));
-  add_temp_file (name);
 
   /* Open our test file.   */
   fd = mkstemp64 (name);
@@ -71,6 +70,7 @@ do_prepare (int argc, char *argv[])
       else
 	error (EXIT_FAILURE, errno, "cannot create temporary file");
     }
+  add_temp_file (name);
 
   if (getrlimit64 (RLIMIT_FSIZE, &rlim) != 0)
     {
diff --git a/login/tst-utmp.c b/login/tst-utmp.c
index a69a556..a029003 100644
--- a/login/tst-utmp.c
+++ b/login/tst-utmp.c
@@ -65,12 +65,12 @@ do_prepare (int argc, char *argv[])
   name = malloc (name_len + sizeof ("/utmpXXXXXX"));
   mempcpy (mempcpy (name, test_dir, name_len),
 	   "/utmpXXXXXX", sizeof ("/utmpXXXXXX"));
-  add_temp_file (name);
 
   /* Open our test file.  */
   fd = mkstemp (name);
   if (fd == -1)
     error (EXIT_FAILURE, errno, "cannot open test file `%s'", name);
+  add_temp_file (name);
 }
 
 struct utmp entry[] =
diff --git a/rt/tst-aio.c b/rt/tst-aio.c
index 783907e..007ef6c 100644
--- a/rt/tst-aio.c
+++ b/rt/tst-aio.c
@@ -54,12 +54,12 @@ do_prepare (int argc, char *argv[])
   name = malloc (name_len + sizeof ("/aioXXXXXX"));
   mempcpy (mempcpy (name, test_dir, name_len),
 	   "/aioXXXXXX", sizeof ("/aioXXXXXX"));
-  add_temp_file (name);
 
   /* Open our test file.   */
   fd = mkstemp (name);
   if (fd == -1)
     error (EXIT_FAILURE, errno, "cannot open test file `%s'", name);
+  add_temp_file (name);
 }
 
 
diff --git a/rt/tst-aio64.c b/rt/tst-aio64.c
index 3a9ae79..b315eec 100644
--- a/rt/tst-aio64.c
+++ b/rt/tst-aio64.c
@@ -55,12 +55,12 @@ do_prepare (int argc, char *argv[])
   name = malloc (name_len + sizeof ("/aioXXXXXX"));
   mempcpy (mempcpy (name, test_dir, name_len),
 	   "/aioXXXXXX", sizeof ("/aioXXXXXX"));
-  add_temp_file (name);
 
   /* Open our test file.   */
   fd = mkstemp (name);
   if (fd == -1)
     error (EXIT_FAILURE, errno, "cannot open test file `%s'", name);
+  add_temp_file (name);
 }
 
 

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

Summary of changes:
 ChangeLog        |    8 ++++++++
 io/test-lfs.c    |    2 +-
 login/tst-utmp.c |    2 +-
 rt/tst-aio.c     |    2 +-
 rt/tst-aio64.c   |    2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)


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



More information about the Glibc-cvs mailing list