[libc++] Fix filesystem tests on platforms that don't have IO

[ldionne]

Summary

This patch moves a few tests that were still using std::fprintf to
using TEST_REQUIRE instead, which provides a single point to tweak
for platforms that don't implement fprintf. As a fly-by fix, it also
avoids including time_utils.h in filesystem_clock.cpp when it is
not required, since that header makes some pretty large assumptions
about the platform it is on.

[ldionne]

Add missing includes to test.

[ldionne]

Fix unused var warning.

[ldionne]

Fix C++11 build.

[ldionne]

Poke CI.

libcxx/src/filesystem/filesystem_clock.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include <__config>
 #include <chrono>
 #include <filesystem>
 #include <time.h>
 
-#include "time_utils.h"
+#if defined(_LIBCPP_WIN32API)
+#  include "time_utils.h"
+#endif
 
 #if defined(_LIBCPP_WIN32API)
 # define WIN32_LEAN_AND_MEAN
 # define NOMINMAX
 # include <windows.h>
 #endif
 
 #if __has_include(<unistd.h>)

libcxx/test/std/input.output/filesystems/class.path/path.member/path.gen/lexically_normal.pass.cpp

 
 // <filesystem>
 
 // class path
 
 // path lexically_normal() const;
 
 #include "filesystem_include.h"
-#include <cstdio>
 #include <string>
 
 #include "../../path_helper.h"
 #include "count_new.h"
 #include "test_macros.h"
-
+#include "assert_macros.h"
+#include "concat_macros.h"
 
 int main(int, char**) {
   // clang-format off
   struct {
     std::string input;
     std::string expect;
   } TestCases[] = {
       {"", ""},
#endif
       {"foo/../bar/../..///", ".."},
       {"foo/../bar/..//..///../", "../.."},
       // p8: If the path is empty, add a dot
       {".", "."},
       {"./", "."},
       {"foo/..", "."}
   };
   // clang-format on
-  int ID = 0;
-  bool Failed = false;
   for (auto& TC : TestCases) {
-    ++ID;
     fs::path p(TC.input);
     const fs::path output = p.lexically_normal();
     fs::path expect(TC.expect);
     expect.make_preferred();
-    if (!PathEq(output, expect)) {
-      Failed = true;
-      std::fprintf(stderr, "TEST CASE #%d FAILED:\n"
-                  "  Input: '%s'\n"
-                  "  Expected: '%s'\n"
-                  "  Output: '%s'\n",
-        ID, TC.input.c_str(), expect.string().c_str(), output.string().c_str());
-    }
+
+    TEST_REQUIRE(
+        PathEq(output, expect),
+        TEST_WRITE_CONCATENATED("Input: ", TC.input, "\nExpected: ", expect.string(), "\nOutput: ", output.string()));
   }
-  return Failed;
+  return 0;
 }

libcxx/test/std/input.output/filesystems/class.path/path.member/path.gen/lexically_relative_and_proximate.pass.cpp

 // <filesystem>
 
 // class path
 
 // path lexically_relative(const path& p) const;
 // path lexically_proximate(const path& p) const;
 
 #include "filesystem_include.h"
-#include <cstdio>
 #include <string>
 
 #include "../../path_helper.h"
+#include "assert_macros.h"
+#include "concat_macros.h"
 #include "count_new.h"
 #include "test_macros.h"
 
 int main(int, char**) {
   // clang-format off
   struct {
     std::string input;
     std::string base;
#endif
       {"/a/d", "/a/b/c", "../../d"},
       {"/a/b/c", "/a/d", "../b/c"},
       {"a/b/c", "a", "b/c"},
       {"a/b/c", "a/b/c/x/y", "../.."},
       {"a/b/c", "a/b/c", "."},
       {"a/b", "c/d", "../../a/b"}
   };
   // clang-format on
-  int ID = 0;
-  bool Failed = false;
   for (auto& TC : TestCases) {
-    ++ID;
     const fs::path p(TC.input);
     const fs::path output = p.lexically_relative(TC.base);
     fs::path expect(TC.expect);
     expect.make_preferred();
-    auto ReportErr = [&](const char* Testing, fs::path const& Output,
-                                              fs::path const& Expected) {
-      Failed = true;
-      std::fprintf(stderr, "TEST CASE #%d FAILED:\n"
-                  "  Testing: %s\n"
-                  "  Input: '%s'\n"
-                  "  Base: '%s'\n"
-                  "  Expected: '%s'\n"
-                  "  Output: '%s'\n",
-        ID, Testing, TC.input.c_str(), TC.base.c_str(),
-        Expected.string().c_str(), Output.string().c_str());
-    };
-    if (!PathEq(output, expect))
-      ReportErr("path::lexically_relative", output, expect);
+
+    // clang-format off
+    TEST_REQUIRE(
+        PathEq(output, expect),
+        TEST_WRITE_CONCATENATED(
+            "path::lexically_relative test case failed",
+            "\nInput: ", TC.input,
+            "\nBase: ", TC.base,
+            "\nExpected: ", expect,
+            "\nOutput: ", output));
+    // clang-format on
+
     const fs::path proximate_output = p.lexically_proximate(TC.base);
     // [path.gen] lexically_proximate
     // Returns: If the value of lexically_relative(base) is not an empty path,
     // return it. Otherwise return *this.
     const fs::path proximate_expect = expect.empty() ? p : expect;
-    if (!PathEq(proximate_output, proximate_expect))
-      ReportErr("path::lexically_proximate", proximate_output, proximate_expect);
+
+    // clang-format off
+    TEST_REQUIRE(
+        PathEq(proximate_output, proximate_expect),
+        TEST_WRITE_CONCATENATED(
+            "path::lexically_proximate test case failed",
+            "\nInput: ", TC.input,
+            "\nBase: ", TC.base,
+            "\nExpected: ", proximate_expect,
+            "\nOutput: ", proximate_output));
+    // clang-format on
   }
-  return Failed;
+
+  return 0;
 }

libcxx/test/std/input.output/filesystems/fs.enum/enum.directory_options.pass.cpp

 
 // <filesystem>
 
 // enum class directory_options;
 
 #include "filesystem_include.h"
 #include <type_traits>
 #include <cassert>
-#include <sys/stat.h>
 
 #include "test_macros.h"
 #include "check_bitmask_types.h"
 
 
 constexpr fs::directory_options ME(int val) { return static_cast<fs::directory_options>(val); }
 
 int main(int, char**) {

libcxx/test/std/input.output/filesystems/fs.enum/enum.perm_options.pass.cpp

 
 // <filesystem>
 
 // enum class perm_options;
 
 #include "filesystem_include.h"
 #include <type_traits>
 #include <cassert>
-#include <sys/stat.h>
 
 #include "test_macros.h"
 #include "check_bitmask_types.h"
 
 
 constexpr fs::perm_options ME(int val) {
   return static_cast<fs::perm_options>(val);
 }

libcxx/test/std/input.output/filesystems/fs.enum/enum.perms.pass.cpp

 
 // <filesystem>
 
 // enum class perms;
 
 #include "filesystem_include.h"
 #include <type_traits>
 #include <cassert>
-#include <sys/stat.h>
 
 #include "test_macros.h"
 #include "check_bitmask_types.h"
 
 
 constexpr fs::perms ME(int val) { return static_cast<fs::perms>(val); }
 
 int main(int, char**) {

libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.proximate/proximate.pass.cpp

 // <filesystem>
 
 // path proximate(const path& p, error_code &ec)
 // path proximate(const path& p, const path& base = current_path())
 // path proximate(const path& p, const path& base, error_code& ec);
 
 #include "filesystem_include.h"
 #include <cassert>
-#include <cstdio>
 
+#include "assert_macros.h"
+#include "concat_macros.h"
 #include "test_macros.h"
 #include "count_new.h"
 #include "filesystem_test_helper.h"
 #include "../../class.path/path_helper.h"
 
 static int count_path_elems(const fs::path& p) {
   int count = 0;
   for (auto&& elem : p) {
     if (elem != p.root_name() && elem != "/" && elem != "")
       ++count;
   }
   return count;
 }
 
-
-static void signature_test()
-{
-    using fs::path;
-    const path p; ((void)p);
-    std::error_code ec; ((void)ec);
-    ASSERT_NOT_NOEXCEPT(proximate(p));
-    ASSERT_NOT_NOEXCEPT(proximate(p, p));
-    ASSERT_NOT_NOEXCEPT(proximate(p, ec));
-    ASSERT_NOT_NOEXCEPT(proximate(p, p, ec));
+static void signature_test() {
+  const path p;
+  ((void)p);
+  std::error_code ec;
+  ((void)ec);
 }
 
 static void basic_test() {
   using fs::path;
-  const path cwd = fs::current_path();
+  const path cwd        = fs::current_path();
   const path parent_cwd = cwd.parent_path();
-  const path curdir = cwd.filename();
+  const path curdir     = cwd.filename();
   assert(!cwd.native().empty());
   int cwd_depth = count_path_elems(cwd);
   path dot_dot_to_root;
-  for (int i=0; i < cwd_depth; ++i)
+  for (int i = 0; i < cwd_depth; ++i)
     dot_dot_to_root /= "..";
   path relative_cwd = cwd.native().substr(cwd.root_path().native().size());
   // clang-format off
   struct {
     fs::path input;
     fs::path base;
     fs::path expect;
   } TestCases[] = {
#endif
       {"/a/d", "/a/b/c", "../../d"},
       {"/a/b/c", "/a/d", "../b/c"},
       {"a/b/c", "a", "b/c"},
       {"a/b/c", "a/b/c/x/y", "../.."},
       {"a/b/c", "a/b/c", "."},
       {"a/b", "c/d", "../../a/b"}
   };
   // clang-format on
-  int ID = 0;
   for (auto& TC : TestCases) {
-    ++ID;
-    std::error_code ec = GetTestEC();
-    fs::path p = TC.input;
+    std::error_code ec    = GetTestEC();
+    fs::path p            = TC.input;
     const fs::path output = fs::proximate(p, TC.base, ec);
-    fs::path expect = TC.expect;
+    fs::path expect       = TC.expect;
     expect.make_preferred();
-    if (ec) {
-      assert(!ec);
-      std::fprintf(stderr, "TEST CASE #%d FAILED:\n"
-                  "  Input: '%s'\n"
-                  "  Base: '%s'\n"
-                  "  Expected: '%s'\n",
-        ID, TC.input.string().c_str(), TC.base.string().c_str(),
-        expect.string().c_str());
-    } else if (!PathEq(output, expect)) {
-      assert(PathEq(output, expect));
+    TEST_REQUIRE(!ec,
+                 TEST_WRITE_CONCATENATED(
+                     "Input: ", TC.input.string(), "\nBase: ", TC.base.string(), "\nExpected: ", expect.string()));
 
-      const path canon_input = fs::weakly_canonical(TC.input);
-      const path canon_base = fs::weakly_canonical(TC.base);
-      const path lexically_p = canon_input.lexically_proximate(canon_base);
-      std::fprintf(stderr, "TEST CASE #%d FAILED:\n"
-                  "  Input: '%s'\n"
-                  "  Base: '%s'\n"
-                  "  Expected: '%s'\n"
-                  "  Output: '%s'\n"
-                  "  Lex Prox: '%s'\n"
-                  "  Canon Input: '%s'\n"
-                  "  Canon Base: '%s'\n",
-        ID, TC.input.string().c_str(), TC.base.string().c_str(),
-        expect.string().c_str(), output.string().c_str(),
-        lexically_p.string().c_str(), canon_input.string().c_str(),
-        canon_base.string().c_str());
-    }
+    const path canon_base  = fs::weakly_canonical(TC.base);
+    TEST_REQUIRE(
+        PathEq(output, expect),
+        TEST_WRITE_CONCATENATED(
+            "Input: ",
+            TC.input.string(),
+            "\nBase: ",
+            TC.base.string(),
+            "\nExpected: ",
+            expect.string(),
+            "\nOutput: ",
+            output.string(),
+            "\nLex Prox: ",
+            lexically_p.string(),
+            "\nCanon Input: ",
+            canon_input.string(),
+            "\nCanon Base: ",
+            canon_base.string()));
   }
 }
 
 int main(int, char**) {
   signature_test();
   basic_test();
 
   return 0;
 }

libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.weakly_canonical/weakly_canonical.pass.cpp

 // UNSUPPORTED: availability-filesystem-missing
 
 // <filesystem>
 
 // path weakly_canonical(const path& p);
 // path weakly_canonical(const path& p, error_code& ec);
 
 #include "filesystem_include.h"
-#include <cstdio>
 #include <string>
 
+#include "assert_macros.h"
+#include "concat_macros.h"
 #include "test_macros.h"
 #include "test_iterators.h"
 #include "count_new.h"
 #include "filesystem_test_helper.h"
 #include "../../class.path/path_helper.h"
 
 int main(int, char**) {
-
   static_test_env static_env;
 
   fs::path root = fs::current_path().root_path();
   // clang-format off
   struct {
     fs::path input;
     fs::path expect;
   } TestCases[] = {
#else
       {static_env.SymlinkToDir / "dir2/../dir2/DNE/..", static_env.Dir2 / ""},
 #endif
       {static_env.SymlinkToDir / "dir2/dir3/../DNE/DNE2", static_env.Dir2 / "DNE/DNE2"},
       {static_env.Dir / "../dir1", static_env.Dir},
       {static_env.Dir / "./.", static_env.Dir},
       {static_env.Dir / "DNE/../foo", static_env.Dir / "foo"}
   };
   // clang-format on
-  int ID = 0;
-  bool Failed = false;
   for (auto& TC : TestCases) {
-    ++ID;
-    fs::path p = TC.input;
+    fs::path p      = TC.input;
     fs::path expect = TC.expect;
     expect.make_preferred();
     const fs::path output = fs::weakly_canonical(p);
-    if (!PathEq(output, expect)) {
-      Failed = true;
-      std::fprintf(stderr, "TEST CASE #%d FAILED:\n"
-                  "  Input: '%s'\n"
-                  "  Expected: '%s'\n"
-                  "  Output: '%s'\n",
-        ID, TC.input.string().c_str(), expect.string().c_str(),
-        output.string().c_str());
-    }
+
+    TEST_REQUIRE(PathEq(output, expect),
+                 TEST_WRITE_CONCATENATED(
+                     "Input: ", TC.input.string(), "\nExpected: ", expect.string(), "\nOutput: ", output.string()));
   }
-  return Failed;
+  return 0;
 }

libcxx/test/support/concat_macros.h

#  ifndef TEST_HAS_NO_LOCALIZATION
   } else
 #  endif
     return "Message discarded since it can't be streamed to std::cerr.\n";
 }
 
 // Writes its arguments to stderr, using the test_concat_message helper.
 #  define TEST_WRITE_CONCATENATED(...) [&] { ::test_eprintf("%s", ::test_concat_message(__VA_ARGS__).c_str()); }
 
+#else
+
+// Fallback definition before C++20 that allows using the macro but doesn't provide a very good message.
+#  define TEST_WRITE_CONCATENATED(...) [&] { ::test_eprintf("%s", TEST_STRINGIZE(__VA_ARGS__)); }
+
 #endif // TEST_STD_VER > 17
 
 #endif //  TEST_SUPPORT_CONCAT_MACROS_H

libcxx/test/support/test_macros.h

 #   include <__config>
 #   define TEST_IMP_INCLUDED_HEADER
 # endif
 #endif
 #ifndef TEST_IMP_INCLUDED_HEADER
 #include <ciso646>
 #endif
 
-#define TEST_STRINGIZE_IMPL(x) #x
-#define TEST_STRINGIZE(x) TEST_STRINGIZE_IMPL(x)
+#define TEST_STRINGIZE_IMPL(...) #__VA_ARGS__
+#define TEST_STRINGIZE(...) TEST_STRINGIZE_IMPL(__VA_ARGS__)
 
 #define TEST_CONCAT1(X, Y) X##Y
 #define TEST_CONCAT(X, Y) TEST_CONCAT1(X, Y)
 
 #ifdef __has_feature
 #define TEST_HAS_FEATURE(X) __has_feature(X)
 #else
 #define TEST_HAS_FEATURE(X) 0