diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tests/test-getopt-gnu.c | 1 | ||||
| -rw-r--r-- | tests/test-getopt-main.h | 4 | ||||
| -rw-r--r-- | tests/test-getopt-posix.c | 1 |
4 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2016-12-29 Eric Blake <eblake@redhat.com> + + getopt: fix parallel test failure + * tests/test-getopt-posix.c (TEST_GETOPT_TMP_NAME): Set name. + * tests/test-getopt-gnu.c (TEST_GETOPT_TMP_NAME): Likewise. + * tests/test-getopt-main.h (main): Use different file names + in case test-getopt-gnu and test-getopt-posix run in parallel. + 2016-12-29 Paul Eggert <eggert@cs.ucla.edu> xalloc: x2nrealloc check for ptrdiff_t overflow diff --git a/tests/test-getopt-gnu.c b/tests/test-getopt-gnu.c index eb0a166429..2d9a4bd1da 100644 --- a/tests/test-getopt-gnu.c +++ b/tests/test-getopt-gnu.c @@ -41,4 +41,5 @@ SIGNATURE_CHECK (getopt_long_only, int, (int, char *__getopt_argv_const *, int *)); #define TEST_GETOPT_GNU 1 +#define TEST_GETOPT_TMP_NAME "test-getopt-gnu.tmp" #include "test-getopt-main.h" diff --git a/tests/test-getopt-main.h b/tests/test-getopt-main.h index 2c9fa49a97..aef74f55b5 100644 --- a/tests/test-getopt-main.h +++ b/tests/test-getopt-main.h @@ -48,7 +48,7 @@ main (void) || (myerr = fdopen (BACKUP_STDERR_FILENO, "w")) == NULL) return 2; - ASSERT (freopen ("test-getopt.tmp", "w", stderr) == stderr); + ASSERT (freopen (TEST_GETOPT_TMP_NAME, "w", stderr) == stderr); /* These default values are required by POSIX. */ ASSERT (optind == 1); @@ -70,7 +70,7 @@ main (void) #endif ASSERT (fclose (stderr) == 0); - ASSERT (remove ("test-getopt.tmp") == 0); + ASSERT (remove (TEST_GETOPT_TMP_NAME) == 0); return 0; } diff --git a/tests/test-getopt-posix.c b/tests/test-getopt-posix.c index c89981fd1a..5532271f2b 100644 --- a/tests/test-getopt-posix.c +++ b/tests/test-getopt-posix.c @@ -30,4 +30,5 @@ #include <unistd.h> #define TEST_GETOPT_GNU 0 +#define TEST_GETOPT_TMP_NAME "test-getopt-posix.tmp" #include "test-getopt-main.h" |