[libcxx-commits] [libcxx] d167fe0 - [libc++][NFC] Refactor filesystem namespace test

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2023-06-12T12:43:19-07:00
New Revision: d167fe0c4ed6983b56c6b0209eb2a2b4cc1d3e0e

URL: https://github.com/llvm/llvm-project/commit/d167fe0c4ed6983b56c6b0209eb2a2b4cc1d3e0e
DIFF: https://github.com/llvm/llvm-project/commit/d167fe0c4ed6983b56c6b0209eb2a2b4cc1d3e0e.diff

LOG: [libc++][NFC] Refactor filesystem namespace test

Added: 
    libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.compile.pass.cpp
    libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.verify.cpp

Modified: 
    

Removed: 
    libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.fail.cpp
    libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.pass.cpp


################################################################################
diff  --git a/libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.compile.pass.cpp
similarity index 68%
rename from libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.pass.cpp
rename to libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.compile.pass.cpp
index 86ca77969c639..a8479a359986d 100644
--- a/libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.compile.pass.cpp
@@ -13,17 +13,5 @@
 // namespace std::filesystem
 
 #include <filesystem>
-#include <type_traits>
 
-#include "test_macros.h"
-
-using namespace std::filesystem;
-
-int main(int, char**) {
-  static_assert(std::is_same<
-          path,
-          std::filesystem::path
-      >::value, "");
-
-  return 0;
-}
+namespace fs = std::filesystem;

diff  --git a/libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.fail.cpp b/libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.verify.cpp
similarity index 64%
rename from libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.fail.cpp
rename to libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.verify.cpp
index 396ed4a2e76e4..fd07ccaec971a 100644
--- a/libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.fail.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.req.namespace/namespace.verify.cpp
@@ -13,18 +13,5 @@
 // namespace std::filesystem
 
 #include <filesystem>
-#include "test_macros.h"
 
-using namespace std::filesystem;
-
-#if TEST_STD_VER >= 11
-// expected-error at -3 {{no namespace named 'filesystem' in namespace 'std';}}
-#else
-// expected-error at -5 {{expected namespace name}}
-#endif
-
-int main(int, char**) {
-
-
-  return 0;
-}
+namespace fs = std::filesystem; // expected-error-re {{{{(no namespace named 'filesystem' in namespace 'std';)|(expected namespace name)}}}}