From dd5adad1a74e12bb8dbd01451794269a31ce9f0f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 11 Mar 2007 00:51:51 +0000 Subject: [PATCH] Choose better temporary filenames. --- ChangeLog | 6 ++++++ tests/test-binary-io.c | 8 ++++---- tests/test-binary-io.sh | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f26043f55..79d7e66836 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-03-10 Bruno Haible + + * tests/test-binary-io.sh: Use temporary filenames that are not so + likely to clash with those of other tests (in a parallel make). + * tests/test-binary-io.c: Likewise. + 2007-03-10 Bruno Haible * lib/fseterr.c (fseterr): Port to Solaris/SPARC64. Deactivate the diff --git a/tests/test-binary-io.c b/tests/test-binary-io.c index 3f5e9ccbf9..718a66e54f 100644 --- a/tests/test-binary-io.c +++ b/tests/test-binary-io.c @@ -37,18 +37,18 @@ main () { /* Test the O_BINARY macro. */ { - int fd = open ("output2.tmp", O_CREAT | O_TRUNC | O_RDWR | O_BINARY); + int fd = open ("t-bin-out2.tmp", O_CREAT | O_TRUNC | O_RDWR | O_BINARY); if (write (fd, "Hello\n", 6) < 0) exit (1); close (fd); } { struct stat statbuf; - if (stat ("output2.tmp", &statbuf) < 0) + if (stat ("t-bin-out2.tmp", &statbuf) < 0) exit (1); ASSERT (statbuf.st_size == 6); } - unlink ("output2.tmp"); + unlink ("t-bin-out2.tmp"); /* Test the SET_BINARY macro. */ SET_BINARY (1); @@ -57,7 +57,7 @@ main () fclose (stderr); { struct stat statbuf; - if (stat ("output.tmp", &statbuf) < 0) + if (stat ("t-bin-out1.tmp", &statbuf) < 0) exit (1); ASSERT (statbuf.st_size == 6); } diff --git a/tests/test-binary-io.sh b/tests/test-binary-io.sh index 22c4dcd40c..33e128c309 100755 --- a/tests/test-binary-io.sh +++ b/tests/test-binary-io.sh @@ -3,8 +3,8 @@ tmpfiles="" trap 'rm -fr $tmpfiles' 1 2 3 15 -tmpfiles="$tmpfiles output.tmp output2.tmp" -./test-binary-io${EXEEXT} > output.tmp || exit 1 +tmpfiles="$tmpfiles t-bin-out1.tmp t-bin-out2.tmp" +./test-binary-io${EXEEXT} > t-bin-out1.tmp || exit 1 rm -fr $tmpfiles -- 2.30.2