* testsuite/util/testsuite_fs.h (nonexistent_path): Use less generic

	name for paths. Prefer snprintf to sprintf.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228416 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 239cd4467de82c04b7111693f60a1fd59e6d8d73..287768e4132e20a32736a47cab9e7c6bcf38faad 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2015-10-02  Jonathan Wakely  <jwakely@redhat.com>
 
+       * testsuite/util/testsuite_fs.h (nonexistent_path): Use less generic
+       name for paths. Prefer snprintf to sprintf.
+
        PR libstdc++/67747
        * src/filesystem/dir.cc (native_readdir): Remove.
        (_Dir::advance): Use readdir instead of native_readdir.

diff --git a/libstdc++-v3/testsuite/util/testsuite_fs.h b/libstdc++-v3/testsuite/util/testsuite_fs.h
index 524972ece9b795d15ab661fa01ab45f21cc9b18c..44aef115ff34b048e55820786d38522891e6c82d 100644 (file)
--- a/libstdc++-v3/testsuite/util/testsuite_fs.h
+++ b/libstdc++-v3/testsuite/util/testsuite_fs.h
@@ -73,7 +73,7 @@ namespace __gnu_test
   {
     std::experimental::filesystem::path p;
 #if defined(_GNU_SOURCE) || _XOPEN_SOURCE >= 500 || _POSIX_C_SOURCE >= 200112L
-    char tmp[] = "test.XXXXXX";
+    char tmp[] = "filesystem-ts-test.XXXXXX";
     int fd = ::mkstemp(tmp);
     if (fd == -1)
       throw std::experimental::filesystem::filesystem_error("mkstemp failed",
@@ -83,7 +83,11 @@ namespace __gnu_test
     p = tmp;
 #else
     char buf[64];
-    std::sprintf(buf, "test.%lu", (unsigned long)::getpid());
+#if _GLIBCXX_USE_C99
+    std::snprintf(buf, 64, "filesystem-ts-test.%lu", (unsigned long)::getpid());
+#else
+    std::sprintf(buf, "filesystem-ts-test.%lu", (unsigned long)::getpid());
+#endif
     p = buf;
 #endif
     return p;