diff options
| author | Jonathan Yong <10walls@gmail.com> | 2021-08-22 03:05:07 +0000 |
|---|---|---|
| committer | Jonathan Yong <10walls@gmail.com> | 2021-08-23 02:17:48 +0000 |
| commit | 4a4616e53f440e15d0f3e91e23b67a3b5c84dddf (patch) | |
| tree | b4f6cb69eeb142bb0ce86f6f929adf6a61a52d7b /gcc | |
| parent | 5b2876f96c16f43c7b4810237ac92bb8f9d18c01 (diff) | |
| download | gcc-4a4616e53f440e15d0f3e91e23b67a3b5c84dddf.zip gcc-4a4616e53f440e15d0f3e91e23b67a3b5c84dddf.tar.gz gcc-4a4616e53f440e15d0f3e91e23b67a3b5c84dddf.tar.bz2 | |
gcc.c-torture/execute: Fix tmpnam issue on Windows
2021-08-22 Jonathan Yong <10walls@gmail.com>
gcc/testsuite/ChangeLog:
* gcc.c-torture/execute/gcc_tmpnam.h: Fix tmpnam case on Windows
where it can return a filename with "\" to indicate current
directory.
* gcc.c-torture/execute/fprintf-2.c: Use wrapper.
* gcc.c-torture/execute/printf-2.c: Use wrapper.
* gcc.c-torture/execute/user-printf.c: Use wrapper.
Signed-off-by: Jonathan Yong <10walls@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/execute/fprintf-2.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/execute/gcc_tmpnam.h | 13 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/execute/printf-2.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/execute/user-printf.c | 3 |
4 files changed, 19 insertions, 3 deletions
diff --git a/gcc/testsuite/gcc.c-torture/execute/fprintf-2.c b/gcc/testsuite/gcc.c-torture/execute/fprintf-2.c index d8e19e7..00517d1 100644 --- a/gcc/testsuite/gcc.c-torture/execute/fprintf-2.c +++ b/gcc/testsuite/gcc.c-torture/execute/fprintf-2.c @@ -9,10 +9,11 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "gcc_tmpnam.h" int main (void) { - char *tmpfname = tmpnam (0); + char *tmpfname = gcc_tmpnam (0); FILE *f = fopen (tmpfname, "w"); if (!f) { diff --git a/gcc/testsuite/gcc.c-torture/execute/gcc_tmpnam.h b/gcc/testsuite/gcc.c-torture/execute/gcc_tmpnam.h new file mode 100644 index 0000000..2136e6e --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/gcc_tmpnam.h @@ -0,0 +1,13 @@ +#include <stdio.h> +#ifndef GCC_TMPNAM +#define GCC_TMPNAM +static inline char *gcc_tmpnam(char *s) +{ + char *ret = tmpnam (s); + // Windows sometimes prepends a backslash to denote the current directory, + // so swallow that if it occurs + if (ret[0] == '\\') + ++ret; + return ret; +} +#endif diff --git a/gcc/testsuite/gcc.c-torture/execute/printf-2.c b/gcc/testsuite/gcc.c-torture/execute/printf-2.c index 4e7d8f7..2087bba 100644 --- a/gcc/testsuite/gcc.c-torture/execute/printf-2.c +++ b/gcc/testsuite/gcc.c-torture/execute/printf-2.c @@ -10,6 +10,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "gcc_tmpnam.h" __attribute__ ((noipa)) void write_file (void) @@ -26,7 +27,7 @@ write_file (void) int main (void) { - char *tmpfname = tmpnam (0); + char *tmpfname = gcc_tmpnam (0); FILE *f = freopen (tmpfname, "w", stdout); if (!f) { diff --git a/gcc/testsuite/gcc.c-torture/execute/user-printf.c b/gcc/testsuite/gcc.c-torture/execute/user-printf.c index 42a3b17..bfee076 100644 --- a/gcc/testsuite/gcc.c-torture/execute/user-printf.c +++ b/gcc/testsuite/gcc.c-torture/execute/user-printf.c @@ -11,6 +11,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "gcc_tmpnam.h" void __attribute__ ((format (printf, 1, 2), noipa)) user_print (const char *fmt, ...) @@ -23,7 +24,7 @@ user_print (const char *fmt, ...) int main (void) { - char *tmpfname = tmpnam (0); + char *tmpfname = gcc_tmpnam (0); FILE *f = freopen (tmpfname, "w", stdout); if (!f) { |