diff options
23 files changed, 60 insertions, 51 deletions
diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/canonical.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/canonical.cc index bc7ef0d..9c432b2 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/canonical.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/canonical.cc @@ -111,10 +111,13 @@ test03() fs::path foo = dir/"foo", bar = dir/"bar"; fs::create_directory(foo); fs::create_directory(bar); +#ifdef NO_SYMLINKS #if defined(__MINGW32__) || defined(__MINGW64__) - // No symlink support const fs::path baz = dir/"foo\\\\..\\bar///"; #else + const fs::path baz = dir/"foo//../bar///"; +#endif +#else fs::create_symlink("../bar", foo/"baz"); const fs::path baz = dir/"foo//./baz///"; #endif diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/copy.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/copy.cc index f3081f4..f9fb4df 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/copy.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/copy.cc @@ -66,11 +66,7 @@ test01() void test02() { -#if defined(__MINGW32__) || defined(__MINGW64__) - // No symlink support - return; -#endif - +#ifndef NO_SYMLINKS const std::error_code bad_ec = make_error_code(std::errc::invalid_argument); auto from = __gnu_test::nonexistent_path(); std::error_code ec; @@ -110,6 +106,7 @@ test02() remove(from, ec); remove(to, ec); +#endif } // Test is_regular_file(f) case. diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directories.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directories.cc index 4a7ba1f..2b48c15 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directories.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directories.cc @@ -148,9 +148,7 @@ test03() void test04() { -#if defined(__MINGW32__) || defined(__MINGW64__) - // no symlinks -#else +#ifndef NO_SYMLINKS // PR libstdc++/101510 // create_directories reports an error if the path is a symlink to a dir std::error_code ec = make_error_code(std::errc::invalid_argument); diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directory.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directory.cc index 90f9830..aa59f7f 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directory.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directory.cc @@ -70,9 +70,7 @@ test01() VERIFY( e.path1() == f ); } -#if defined(__MINGW32__) || defined(__MINGW64__) - // no symlinks -#else +#ifndef NO_SYMLINKS // PR libstdc++/101510 create_directory on an existing symlink to a directory fs::create_directory(p/"dir"); auto link = p/"link"; diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/permissions.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/permissions.cc index deed759..ee5afd5 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/permissions.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/permissions.cc @@ -76,6 +76,7 @@ test02() void test03() { +#ifndef NO_SYMLINKS using std::filesystem::perms; using std::filesystem::perm_options; @@ -111,11 +112,13 @@ test03() VERIFY( !caught ); remove(p); +#endif } void test04() { +#ifndef NO_SYMLINKS using perms = std::filesystem::perms; auto p = __gnu_test::nonexistent_path(); @@ -137,6 +140,7 @@ test04() VERIFY( ec == ec2 ); remove(p); +#endif } void diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/read_symlink.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/read_symlink.cc index 68bbab3..030d627 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/read_symlink.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/read_symlink.cc @@ -17,7 +17,7 @@ // { dg-do run { target c++17 } } // { dg-require-filesystem-ts "" } -// { dg-xfail-if "symlinks not supported" { *-*-mingw* } } +// { dg-require-target-fs-symlinks "" } #include <filesystem> #include <testsuite_hooks.h> diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/remove.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/remove.cc index 26f2d54..f769723 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/remove.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/remove.cc @@ -41,9 +41,7 @@ test01() VERIFY( !ec ); VERIFY( !n ); -#if defined(__MINGW32__) || defined(__MINGW64__) - // No symlink support -#else +#ifndef NO_SYMLINKS auto link = __gnu_test::nonexistent_path(); create_symlink(p, link); // dangling symlink ec = bad_ec; diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/remove_all.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/remove_all.cc index 943d85c..d5266a4 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/remove_all.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/remove_all.cc @@ -41,9 +41,7 @@ test01() VERIFY( !ec ); VERIFY( n == 0 ); -#if defined(__MINGW32__) || defined(__MINGW64__) - // No symlink support -#else +#ifndef NO_SYMLINKS auto link = __gnu_test::nonexistent_path(); create_symlink(p, link); // dangling symlink ec = bad_ec; diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc index f23a286..b74e113 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/rename.cc @@ -75,9 +75,7 @@ test01() void test_symlinks() { -#if defined(__MINGW32__) || defined(__MINGW64__) - // No symlink support -#else +#ifndef NO_SYMLINKS std::error_code ec; const std::error_code bad_ec = make_error_code(std::errc::invalid_argument); diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/symlink_status.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/symlink_status.cc index ef973b7..e00e4aa 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/symlink_status.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/symlink_status.cc @@ -17,7 +17,6 @@ // { dg-do run { target c++17 } } // { dg-require-filesystem-ts "" } -// { dg-xfail-if "symlinks not supported" { *-*-mingw* } } #include <filesystem> #include <testsuite_hooks.h> @@ -39,6 +38,7 @@ test01() fs::file_status st2 = fs::symlink_status(dot); VERIFY( st2.type() == fs::file_type::directory ); +#ifndef NO_SYMLINKS fs::path link = __gnu_test::nonexistent_path(); create_directory_symlink(dot, link); __gnu_test::scoped_file l(link, __gnu_test::scoped_file::adopt_file); @@ -49,6 +49,7 @@ test01() st2 = fs::symlink_status(link, ec); VERIFY( !ec ); VERIFY( st2.type() == fs::file_type::symlink ); +#endif } void @@ -68,6 +69,7 @@ test02() void test03() { +#ifndef NO_SYMLINKS if (!__gnu_test::permissions_are_testable()) return; @@ -111,6 +113,7 @@ test03() VERIFY( st2.type() == fs::file_type::symlink ); fs::permissions(dir, fs::perms::owner_all, ec); +#endif } void diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/weakly_canonical.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/weakly_canonical.cc index 244b753..ad164f5 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/weakly_canonical.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/weakly_canonical.cc @@ -39,9 +39,7 @@ test01() fs::create_directory(bar/"baz"); fs::path p; -#if defined(__MINGW32__) || defined(__MINGW64__) - // No symlink support -#else +#ifndef NO_SYMLINKS fs::create_symlink("../bar", foo/"bar"); p = fs::weakly_canonical(dir/"foo//./bar///../biz/."); diff --git a/libstdc++-v3/testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc b/libstdc++-v3/testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc index a201415..393fb31 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/iterators/recursive_directory_iterator.cc @@ -188,7 +188,7 @@ test05() void test06() { -#if !(defined __MINGW32__ || defined __MINGW64__) +#ifndef NO_SYMLINKS auto p = __gnu_test::nonexistent_path(); create_directories(p/"d1/d2"); create_directory_symlink("d1", p/"link"); diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/copy.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/copy.cc index ca38328..021897c 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/copy.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/copy.cc @@ -67,11 +67,7 @@ test01() void test02() { -#if defined(__MINGW32__) || defined(__MINGW64__) - // No symlink support - return; -#endif - +#ifndef NO_SYMLINKS auto from = __gnu_test::nonexistent_path(); std::error_code ec, bad = std::make_error_code(std::errc::invalid_argument); @@ -109,6 +105,7 @@ test02() remove(from, ec); remove(to, ec); +#endif } // Test is_regular_file(f) case. diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc index 03060c6..df27748 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc @@ -147,9 +147,7 @@ test03() void test04() { -#if defined(__MINGW32__) || defined(__MINGW64__) - // no symlinks -#else +#ifndef NO_SYMLINKS // PR libstdc++/101510 // create_directories reports an error if the path is a symlink to a dir std::error_code ec = make_error_code(std::errc::invalid_argument); diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directory.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directory.cc index 67e5fdd..5e9346d 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directory.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directory.cc @@ -69,9 +69,7 @@ test01() VERIFY( e.path1() == f ); } -#if defined(__MINGW32__) || defined(__MINGW64__) - // no symlinks -#else +#ifndef NO_SYMLINKS // PR libstdc++/101510 create_directory on an existing symlink to a directory fs::create_directory(p/"dir"); auto link = p/"link"; diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/permissions.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/permissions.cc index 833aa13..5866e33 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/permissions.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/permissions.cc @@ -72,6 +72,7 @@ test02() void test03() { +#ifndef NO_SYMLINKS using perms = std::experimental::filesystem::perms; __gnu_test::scoped_file f; @@ -95,11 +96,13 @@ test03() VERIFY( ec == ec2 ); remove(p); +#endif } void test04() { +#ifndef NO_SYMLINKS using perms = std::experimental::filesystem::perms; auto p = __gnu_test::nonexistent_path(); @@ -120,6 +123,7 @@ test04() VERIFY( ec == ec2 ); remove(p); +#endif } void diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/read_symlink.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/read_symlink.cc index 75dae3e..d0a90976 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/read_symlink.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/read_symlink.cc @@ -18,7 +18,7 @@ // { dg-options "-DUSE_FILESYSTEM_TS -lstdc++fs" } // { dg-do run { target c++11 } } // { dg-require-filesystem-ts "" } -// { dg-xfail-if "symlinks not supported" { *-*-mingw* } } +// { dg-require-target-fs-symlinks "" } #include <experimental/filesystem> #include <testsuite_hooks.h> diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/remove.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/remove.cc index c01f140..4ffc740 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/remove.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/remove.cc @@ -42,10 +42,7 @@ test01() VERIFY( !ec ); VERIFY( !n ); -#if defined(__MINGW32__) || defined(__MINGW64__) - // No symlink support - return; -#else +#ifndef NO_SYMLINKS auto link = __gnu_test::nonexistent_path(); create_symlink(p, link); // dangling symlink ec = bad_ec; diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/remove_all.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/remove_all.cc index 4b0ce85..11c07d4 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/remove_all.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/remove_all.cc @@ -42,9 +42,7 @@ test01() VERIFY( !ec ); VERIFY( n == 0 ); -#if defined(__MINGW32__) || defined(__MINGW64__) - // No symlink support -#else +#ifndef NO_SYMLINKS auto link = __gnu_test::nonexistent_path(); create_symlink(p, link); // dangling symlink ec = bad_ec; diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/rename.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/rename.cc index 46776e8..37e743b 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/rename.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/rename.cc @@ -75,9 +75,7 @@ test01() void test_symlinks() { -#if defined(__MINGW32__) || defined(__MINGW64__) - // No symlink support -#else +#ifndef NO_SYMLINKS std::error_code ec; const std::error_code bad_ec = make_error_code(std::errc::invalid_argument); diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp b/libstdc++-v3/testsuite/lib/dg-options.exp index 15f37da4..e624a69 100644 --- a/libstdc++-v3/testsuite/lib/dg-options.exp +++ b/libstdc++-v3/testsuite/lib/dg-options.exp @@ -241,6 +241,15 @@ proc dg-require-filesystem-ts { args } { return } +proc dg-require-target-fs-symlinks { args } { + if { ![ check_v3_target_fs_symlinks ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + proc add_options_for_no_pch { flags } { # This forces any generated and possibly included PCH to be invalid. return "-D__GLIBCXX__=99999999" diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 93fdfee..03f47e8 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -974,13 +974,16 @@ proc v3_try_preprocess { name code flags } { } # Return 1 if COND evaluates to true in the preprocessor, 0 otherwise. -# The <bits/c++config.h> config header is included. -proc v3_check_preprocessor_condition { name cond } { +# The <bits/c++config.h> config header is included, and INC, if given, +# is pasted between it and the condition evaluation, so it can be used +# for additional #include's. +proc v3_check_preprocessor_condition { name cond { inc "" } } { global cxxflags global DEFAULT_CXXFLAGS set code " #include <bits/c++config.h> + $inc #if ! ($cond) #error '$cond' is false #endif @@ -1267,6 +1270,14 @@ proc check_v3_target_filesystem_ts { } { }] } +# Return 1 if the libstdc++ filesystem create_symlinks implementation +# is not an always-failing dummy. +proc check_v3_target_fs_symlinks { } { + set inc "#include <testsuite_fs.h>" + set cond "!defined NO_SYMLINKS" + return [v3_check_preprocessor_condition fs_symlinks $cond $inc] +} + # Return 1 if the "cxx11" ABI is in use using the current flags, 0 otherwise. # Any flags provided by RUNTESTFLAGS or a target board will be used here. # Flags added in the test by dg-options or dg-add-options will not be used. diff --git a/libstdc++-v3/testsuite/util/testsuite_fs.h b/libstdc++-v3/testsuite/util/testsuite_fs.h index 9358a04..03af7ae 100644 --- a/libstdc++-v3/testsuite/util/testsuite_fs.h +++ b/libstdc++-v3/testsuite/util/testsuite_fs.h @@ -42,6 +42,10 @@ namespace test_fs = std::experimental::filesystem; #include <random> // std::random_device #endif +#ifndef _GLIBCXX_HAVE_SYMLINK +#define NO_SYMLINKS +#endif + namespace __gnu_test { #define PATH_CHK(p1, p2, fn) \ |