This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Do not leave files behind in /tmp from testing
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Thu, 15 Oct 2015 20:50:50 +0000
- Subject: Do not leave files behind in /tmp from testing
- Authentication-results: sourceware.org; auth=none
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).
2015-10-15 Joseph Myers <joseph@codesourcery.com>
* io/test-lfs.c (do_prepare): Do not call add_temp_file until
after mkstemp64.
* io/tst-fcntl.c (do_prepare): Do not call add_temp_file here.
(do_test): Call add_temp_file here instead.
* login/tst-utmp.c (do_prepare): Do not call add_temp_file until
after mkstemp.
* rt/tst-aio.c (do_prepare): Likewise.
* rt/tst-aio64.c (do_prepare): Likewise.
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/io/tst-fcntl.c b/io/tst-fcntl.c
index dfdb42e..c7b8275 100644
--- a/io/tst-fcntl.c
+++ b/io/tst-fcntl.c
@@ -47,7 +47,6 @@ do_prepare (int argc, char *argv[])
name = malloc (name_len + sizeof ("/fcntlXXXXXX"));
mempcpy (mempcpy (name, test_dir, name_len),
"/fcntlXXXXXX", sizeof ("/fcntlXXXXXX"));
- add_temp_file (name);
}
@@ -68,6 +67,7 @@ do_test (int argc, char *argv[])
printf ("cannot open temporary file: %m\n");
return 1;
}
+ add_temp_file (name);
if (fstat64 (fd, &st) != 0)
{
printf ("cannot stat test file: %m\n");
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);
}
--
Joseph S. Myers
joseph@codesourcery.com