Revert "[libc++] Generate symlinks in static_test_env on the fly"

broadwaylamb · broadwaylamb · commit 718a2927ad15 · 2020-05-06T01:21:53.000+03:00
This reverts commit 645ad5b. This commit did not incorporate all the changes intended.
diff --git a/libcxx/test/std/input.output/filesystems/Inputs/static_test_env/bad_symlink b/libcxx/test/std/input.output/filesystems/Inputs/static_test_env/bad_symlink
@@ -0,0 +1 @@
+dne
diff --git a/libcxx/test/std/input.output/filesystems/Inputs/static_test_env/dir1/dir2/symlink_to_dir3 b/libcxx/test/std/input.output/filesystems/Inputs/static_test_env/dir1/dir2/symlink_to_dir3
@@ -0,0 +1 @@
+dir3
diff --git a/libcxx/test/std/input.output/filesystems/Inputs/static_test_env/symlink_to_dir b/libcxx/test/std/input.output/filesystems/Inputs/static_test_env/symlink_to_dir
@@ -0,0 +1 @@
+dir1
diff --git a/libcxx/test/std/input.output/filesystems/Inputs/static_test_env/symlink_to_empty_file b/libcxx/test/std/input.output/filesystems/Inputs/static_test_env/symlink_to_empty_file
@@ -0,0 +1 @@
+empty_file
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/path.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/path.pass.cpp
@@ -121,8 +121,6 @@ TEST_CASE(path_ctor_calls_refresh) {
 TEST_CASE(path_ctor_dne) {
   using namespace fs;
 
-  static_test_env static_env;
-
   {
     std::error_code ec = GetTestEC();
     directory_entry ent(StaticEnv::DNE, ec);
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp
@@ -112,7 +112,6 @@ TEST_CASE(not_regular_file) {
 TEST_CASE(error_reporting) {
   using namespace fs;
 
-  static_test_env static_env;
   scoped_test_env env;
 
   const path dir = env.create_dir("dir");
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp
@@ -110,7 +110,6 @@ TEST_CASE(not_regular_file) {
 TEST_CASE(error_reporting) {
   using namespace fs;
 
-  static_test_env static_env;
   scoped_test_env env;
 
   const path dir = env.create_dir("dir");
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp
@@ -84,7 +84,6 @@ TEST_CASE(basic) {
 TEST_CASE(error_reporting) {
   using namespace fs;
 
-  static_test_env static_env;
   scoped_test_env env;
 
   const path dir = env.create_dir("dir");
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/ctor.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/ctor.pass.cpp
@@ -60,7 +60,6 @@ TEST_CASE(test_constructor_signatures)
 
 TEST_CASE(test_construction_from_bad_path)
 {
-    static_test_env static_env;
     std::error_code ec;
     directory_options opts = directory_options::none;
     const directory_iterator endIt;
@@ -170,7 +169,6 @@ TEST_CASE(test_open_on_empty_directory_equals_end)
 
 TEST_CASE(test_open_on_directory_succeeds)
 {
-    static_test_env static_env;
     const path testDir = StaticEnv::Dir;
     std::set<path> dir_contents(std::begin(StaticEnv::DirIterationList),
                                 std::end(  StaticEnv::DirIterationList));
@@ -192,7 +190,6 @@ TEST_CASE(test_open_on_directory_succeeds)
 
 TEST_CASE(test_open_on_file_fails)
 {
-    static_test_env static_env;
     const path testFile = StaticEnv::File;
     const directory_iterator endIt{};
     {
@@ -228,7 +225,6 @@ TEST_CASE(test_open_on_dot_dir)
 
 TEST_CASE(test_open_on_symlink)
 {
-    static_test_env static_env;
     const path symlinkToDir = StaticEnv::SymlinkToDir;
     std::set<path> dir_contents;
     for (path const& p : StaticEnv::DirIterationList) {
diff --git a/libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp b/libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp
@@ -43,7 +43,6 @@ TEST_CASE(test_increment_signatures)
 
 TEST_CASE(test_prefix_increment)
 {
-    static_test_env static_env;
     const path testDir = StaticEnv::Dir;
     const std::set<path> dir_contents(std::begin(StaticEnv::RecDirIterationList),
                                       std::end(  StaticEnv::RecDirIterationList));
@@ -67,7 +66,6 @@ TEST_CASE(test_prefix_increment)
 
 TEST_CASE(test_postfix_increment)
 {
-    static_test_env static_env;
     const path testDir = StaticEnv::Dir;
     const std::set<path> dir_contents(std::begin(StaticEnv::RecDirIterationList),
                                       std::end(  StaticEnv::RecDirIterationList));
@@ -91,7 +89,6 @@ TEST_CASE(test_postfix_increment)
 
 TEST_CASE(test_increment_method)
 {
-    static_test_env static_env;
     const path testDir = StaticEnv::Dir;
     const std::set<path> dir_contents(std::begin(StaticEnv::RecDirIterationList),
                                       std::end(  StaticEnv::RecDirIterationList));
@@ -116,7 +113,6 @@ TEST_CASE(test_increment_method)
 
 TEST_CASE(test_follow_symlinks)
 {
-    static_test_env static_env;
     const path testDir = StaticEnv::Dir;
     auto const& IterList = StaticEnv::RecDirFollowSymlinksIterationList;
 
diff --git a/libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.nonmembers/begin_end.pass.cpp b/libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.nonmembers/begin_end.pass.cpp
@@ -43,7 +43,6 @@ TEST_CASE(test_function_signatures)
 
 TEST_CASE(test_ranged_for_loop)
 {
-    static_test_env static_env;
     const path testDir = StaticEnv::Dir;
     std::set<path> dir_contents(std::begin(StaticEnv::RecDirIterationList),
                                 std::end(  StaticEnv::RecDirIterationList));
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.canonical/canonical.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.canonical/canonical.pass.cpp
@@ -47,7 +47,6 @@ TEST_CASE(signature_test)
 // Each scope tests one of the cases.
 TEST_CASE(test_canonical)
 {
-    static_test_env static_env;
     CWDGuard guard;
     // has_root_name() && has_root_directory()
     const path Root = StaticEnv::Root;
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp
@@ -36,7 +36,6 @@ TEST_CASE(signature_test) {
 }
 
 TEST_CASE(equivalent_test) {
-  static_test_env static_env;
   struct TestCase {
     path lhs;
     path rhs;
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.file_size/file_size.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.file_size/file_size.pass.cpp
@@ -55,15 +55,13 @@ TEST_CASE(file_size_non_empty)
 
 TEST_CASE(symlink_test_case)
 {
-    static_test_env static_env;
     const path p = StaticEnv::File;
     const path p2 = StaticEnv::SymlinkToFile;
     TEST_CHECK(file_size(p) == file_size(p2));
 }
 
 TEST_CASE(file_size_error_cases)
 {
-  static_test_env static_env;
   struct {
     path p;
     std::errc expected_err;
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_directory/is_directory.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_directory/is_directory.pass.cpp
@@ -69,7 +69,6 @@ TEST_CASE(test_exist_not_found)
 
 TEST_CASE(static_env_test)
 {
-    static_test_env static_env;
     TEST_CHECK(is_directory(StaticEnv::Dir));
     TEST_CHECK(is_directory(StaticEnv::SymlinkToDir));
     TEST_CHECK(!is_directory(StaticEnv::File));
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp
@@ -45,7 +45,6 @@ TEST_CASE(test_exist_not_found)
 
 TEST_CASE(test_is_empty_directory)
 {
-    static_test_env static_env;
     TEST_CHECK(!is_empty(StaticEnv::Dir));
     TEST_CHECK(!is_empty(StaticEnv::SymlinkToDir));
 }
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_symlink/is_symlink.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_symlink/is_symlink.pass.cpp
@@ -63,7 +63,6 @@ TEST_CASE(is_symlink_status_test)
 
 TEST_CASE(static_env_test)
 {
-    static_test_env static_env;
     struct TestCase {
         path p;
         bool expect;
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp
@@ -350,7 +350,6 @@ TEST_CASE(signature_test)
 
 TEST_CASE(read_last_write_time_static_env_test)
 {
-    static_test_env static_env;
     using C = file_time_type::clock;
     file_time_type min = file_time_type::min();
     {
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.relative/relative.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.relative/relative.pass.cpp
@@ -54,21 +54,18 @@ TEST_CASE(test_signature_3) {
 }
 
 TEST_CASE(test_signature_4) {
-  static_test_env static_env;
   fs::path p(StaticEnv::SymlinkToDir);
   const fs::path output = fs::weakly_canonical(p);
   TEST_CHECK(output == std::string(StaticEnv::Dir));
 }
 
 TEST_CASE(test_signature_5) {
-  static_test_env static_env;
   fs::path p(StaticEnv::SymlinkToDir / "dir2/.");
   const fs::path output = fs::weakly_canonical(p);
   TEST_CHECK(output == std::string(StaticEnv::Dir / "dir2"));
 }
 
 TEST_CASE(test_signature_6) {
-  static_test_env static_env;
   // FIXME? If the trailing separator occurs in a part of the path that exists,
   // it is omitted. Otherwise it is added to the end of the result.
   fs::path p(StaticEnv::SymlinkToDir / "dir2/./");
@@ -77,28 +74,24 @@ TEST_CASE(test_signature_6) {
 }
 
 TEST_CASE(test_signature_7) {
-  static_test_env static_env;
   fs::path p(StaticEnv::SymlinkToDir / "dir2/DNE/./");
   const fs::path output = fs::weakly_canonical(p);
   TEST_CHECK(output == std::string(StaticEnv::Dir / "dir2/DNE/"));
 }
 
 TEST_CASE(test_signature_8) {
-  static_test_env static_env;
   fs::path p(StaticEnv::SymlinkToDir / "dir2");
   const fs::path output = fs::weakly_canonical(p);
   TEST_CHECK(output == std::string(StaticEnv::Dir2));
 }
 
 TEST_CASE(test_signature_9) {
-  static_test_env static_env;
   fs::path p(StaticEnv::SymlinkToDir / "dir2/../dir2/DNE/..");
   const fs::path output = fs::weakly_canonical(p);
   TEST_CHECK(output == std::string(StaticEnv::Dir2 / ""));
 }
 
 TEST_CASE(test_signature_10) {
-  static_test_env static_env;
   fs::path p(StaticEnv::SymlinkToDir / "dir2/dir3/../DNE/DNE2");
   const fs::path output = fs::weakly_canonical(p);
   TEST_CHECK(output == std::string(StaticEnv::Dir2 / "DNE/DNE2"));
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.space/space.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.space/space.pass.cpp
@@ -80,8 +80,6 @@ TEST_CASE(test_error_reporting)
 
 TEST_CASE(basic_space_test)
 {
-    static_test_env static_env;
-
     // All the test cases should reside on the same filesystem and therefore
     // should have the same expected result. Compute this expected result
     // one and check that it looks semi-sane.
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp
@@ -103,7 +103,6 @@ TEST_CASE(test_status_cannot_resolve)
 
 TEST_CASE(status_file_types_test)
 {
-    static_test_env static_env;
     scoped_test_env env;
     struct TestCase {
       path p;
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp
@@ -110,7 +110,6 @@ TEST_CASE(test_symlink_status_cannot_resolve)
 
 TEST_CASE(symlink_status_file_types_test)
 {
-    static_test_env static_env;
     scoped_test_env env;
     struct TestCase {
       path p;
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.weakly_canonical/weakly_canonical.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.weakly_canonical/weakly_canonical.pass.cpp
@@ -27,9 +27,6 @@
 
 
 int main(int, char**) {
-
-  static_test_env static_env;
-
   // clang-format off
   struct {
     std::string input;
diff --git a/libcxx/test/support/filesystem_test_helper.h b/libcxx/test/support/filesystem_test_helper.h
@@ -3,7 +3,7 @@
 
 #include "filesystem_include.h"
 
-#include <unistd.h> // for ftruncate, symlink, unlink
+#include <unistd.h> // for ftruncate
 
 #include <cassert>
 #include <cstdio> // for printf
@@ -105,13 +105,6 @@ static const fs::path RecDirFollowSymlinksIterationList[] = {
     makePath("dir1/dir2/symlink_to_dir3/file5"),
 };
 
-static const std::pair<fs::path, fs::path> SymlinkList[] = {
-    {"dne",        makePath("bad_symlink")},
-    {"dir1",       makePath("symlink_to_dir")},
-    {"empty_file", makePath("symlink_to_empty_file")},
-    {"dir3",       makePath("dir1/dir2/symlink_to_dir3")}
-};
-
 } // namespace StaticEnv
 
 namespace random_utils {
@@ -128,39 +121,6 @@ inline char random_hex_char() {
 
 } // namespace random_utils
 
-/// A RAII object that prepares the 'static_test_env' directory for usage in
-/// tests.
-///
-/// Namely, it creates some symlinks that tests expect to be present.
-/// We do it here instead of storing them in the repo to be
-/// cross-toolchain-friendly. The primary use case for this are Windows-hosted
-/// cross-toolchains.
-/// Windows doesn't really have a concept of symlinks. So, when the monorepo
-/// is cloned, those symlinks turn to ordinary text files.
-/// If we cross-compiled libc++ for some symlink-friendly system
-/// (e. g. Linux) and ran tests on the target system, some tests would fail.
-/// Instead, we create symlinks here, when a test is already being executed.
-class static_test_env {
-public:
-  static_test_env() {
-    for (const auto *link = std::begin(StaticEnv::SymlinkList);
-         link != std::end(StaticEnv::SymlinkList);
-         ++link) {
-      int ret = ::symlink(link->first.c_str(), link->second.c_str());
-      assert(ret == 0);
-    }
-  }
-
-  ~static_test_env() {
-    for (const auto *link = std::begin(StaticEnv::SymlinkList);
-         link != std::end(StaticEnv::SymlinkList);
-         ++link) {
-      int ret = ::unlink(link->second.c_str());
-      assert(ret == 0);
-    }
-  }
-};
-
 struct scoped_test_env
 {
     scoped_test_env() : test_root(random_path()) {

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,6 @@ TEST_CASE(path_ctor_calls_refresh) {`
`121`	`121`	`TEST_CASE(path_ctor_dne) {`
`122`	`122`	`using namespace fs;`
`123`	`123`
`124`		`- static_test_env static_env;`
`125`		`-`
`126`	`124`	`{`
`127`	`125`	`std::error_code ec = GetTestEC();`
`128`	`126`	`directory_entry ent(StaticEnv::DNE, ec);`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ TEST_CASE(test_constructor_signatures)`
`60`	`60`
`61`	`61`	`TEST_CASE(test_construction_from_bad_path)`
`62`	`62`	`{`
`63`		`- static_test_env static_env;`
`64`	`63`	`std::error_code ec;`
`65`	`64`	`directory_options opts = directory_options::none;`
`66`	`65`	`const directory_iterator endIt;`
`@@ -170,7 +169,6 @@ TEST_CASE(test_open_on_empty_directory_equals_end)`
`170`	`169`
`171`	`170`	`TEST_CASE(test_open_on_directory_succeeds)`
`172`	`171`	`{`
`173`		`- static_test_env static_env;`
`174`	`172`	`const path testDir = StaticEnv::Dir;`
`175`	`173`	`std::set<path> dir_contents(std::begin(StaticEnv::DirIterationList),`
`176`	`174`	`std::end( StaticEnv::DirIterationList));`
`@@ -192,7 +190,6 @@ TEST_CASE(test_open_on_directory_succeeds)`
`192`	`190`
`193`	`191`	`TEST_CASE(test_open_on_file_fails)`
`194`	`192`	`{`
`195`		`- static_test_env static_env;`
`196`	`193`	`const path testFile = StaticEnv::File;`
`197`	`194`	`const directory_iterator endIt{};`
`198`	`195`	`{`
`@@ -228,7 +225,6 @@ TEST_CASE(test_open_on_dot_dir)`
`228`	`225`
`229`	`226`	`TEST_CASE(test_open_on_symlink)`
`230`	`227`	`{`
`231`		`- static_test_env static_env;`
`232`	`228`	`const path symlinkToDir = StaticEnv::SymlinkToDir;`
`233`	`229`	`std::set<path> dir_contents;`
`234`	`230`	`for (path const& p : StaticEnv::DirIterationList) {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ TEST_CASE(test_increment_signatures)`
`43`	`43`
`44`	`44`	`TEST_CASE(test_prefix_increment)`
`45`	`45`	`{`
`46`		`- static_test_env static_env;`
`47`	`46`	`const path testDir = StaticEnv::Dir;`
`48`	`47`	`const std::set<path> dir_contents(std::begin(StaticEnv::RecDirIterationList),`
`49`	`48`	`std::end( StaticEnv::RecDirIterationList));`
`@@ -67,7 +66,6 @@ TEST_CASE(test_prefix_increment)`
`67`	`66`
`68`	`67`	`TEST_CASE(test_postfix_increment)`
`69`	`68`	`{`
`70`		`- static_test_env static_env;`
`71`	`69`	`const path testDir = StaticEnv::Dir;`
`72`	`70`	`const std::set<path> dir_contents(std::begin(StaticEnv::RecDirIterationList),`
`73`	`71`	`std::end( StaticEnv::RecDirIterationList));`
`@@ -91,7 +89,6 @@ TEST_CASE(test_postfix_increment)`
`91`	`89`
`92`	`90`	`TEST_CASE(test_increment_method)`
`93`	`91`	`{`
`94`		`- static_test_env static_env;`
`95`	`92`	`const path testDir = StaticEnv::Dir;`
`96`	`93`	`const std::set<path> dir_contents(std::begin(StaticEnv::RecDirIterationList),`
`97`	`94`	`std::end( StaticEnv::RecDirIterationList));`
`@@ -116,7 +113,6 @@ TEST_CASE(test_increment_method)`
`116`	`113`
`117`	`114`	`TEST_CASE(test_follow_symlinks)`
`118`	`115`	`{`
`119`		`- static_test_env static_env;`
`120`	`116`	`const path testDir = StaticEnv::Dir;`
`121`	`117`	`auto const& IterList = StaticEnv::RecDirFollowSymlinksIterationList;`
`122`	`118`