From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1814) id D9E2A3857C44; Mon, 23 Aug 2021 02:16:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D9E2A3857C44 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Yong To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-3062] gcc.c-torture/execute: Fix tmpnam issue on Windows X-Act-Checkin: gcc X-Git-Author: Jonathan Yong <10walls@gmail.com> X-Git-Refname: refs/heads/master X-Git-Oldrev: 5b2876f96c16f43c7b4810237ac92bb8f9d18c01 X-Git-Newrev: 4a4616e53f440e15d0f3e91e23b67a3b5c84dddf Message-Id: <20210823021616.D9E2A3857C44@sourceware.org> Date: Mon, 23 Aug 2021 02:16:16 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 02:16:17 -0000 https://gcc.gnu.org/g:4a4616e53f440e15d0f3e91e23b67a3b5c84dddf commit r12-3062-g4a4616e53f440e15d0f3e91e23b67a3b5c84dddf Author: Jonathan Yong <10walls@gmail.com> Date: Sun Aug 22 03:05:07 2021 +0000 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> Diff: --- gcc/testsuite/gcc.c-torture/execute/fprintf-2.c | 3 ++- gcc/testsuite/gcc.c-torture/execute/gcc_tmpnam.h | 13 +++++++++++++ gcc/testsuite/gcc.c-torture/execute/printf-2.c | 3 ++- 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 d8e19e7b2f8..00517d1d1ac 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 #include #include +#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 00000000000..2136e6eaf13 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/gcc_tmpnam.h @@ -0,0 +1,13 @@ +#include +#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 4e7d8f7cdfa..2087bba8448 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 #include #include +#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 42a3b17f123..bfee0760dd7 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 #include #include +#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) {