OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix failing filesystem tests on mingw targets 

* config/abi/pre/gnu.ver (GLIBCXX_3.4.26): Add exports for fstream
	constructors and open members taking wide strings. Fix patterns for
	filesystem::path members to match wstring_view parameters. Add
	exports for shared_ptr members used by directory iterators.
	* src/c++17/fs_ops.cc (remove(const path&, error_code&)): Clear the
	error code parameter if the file doesn't exist.
	* src/filesystem/ops.cc (remove(const path&, error_code&)):
	Likewise.
	* testsuite/27_io/filesystem/operations/canonical.cc: Fix expected
	values for mingw targets, where "/" is not an absolute path. Do not
	test symlinks on mingw targets.
	* testsuite/experimental/filesystem/operations/canonical.cc: Likewise.
	* testsuite/27_io/filesystem/operations/copy.cc: Do not test symlinks
	on mingw targets.
	* testsuite/experimental/filesystem/operations/copy.cc: Likewise.
	* testsuite/27_io/filesystem/operations/create_directories.cc: Check
	that each component of the path is created.
	* testsuite/experimental/filesystem/operations/create_directories.cc:
	Likewise.
	* testsuite/27_io/filesystem/operations/exists.cc: Do not test
	permissions on mingw targets.
	* testsuite/experimental/filesystem/operations/exists.cc: Likewise.
	* testsuite/27_io/filesystem/operations/is_empty.cc: Likewise.
	* testsuite/experimental/filesystem/operations/is_empty.cc: Likewise.
	* testsuite/27_io/filesystem/operations/permissions.cc: XFAIL for
	mingw targets.
	* testsuite/experimental/filesystem/operations/permissions.cc:
	Likewise.
	* testsuite/27_io/filesystem/operations/remove.cc: Do not test
	symlinks or permissions on mingw targets.
	* testsuite/experimental/filesystem/operations/remove.cc: Likewise.
	* testsuite/27_io/filesystem/operations/remove_all.cc: Do not test
	symlinks on mingw targets.
	* testsuite/experimental/filesystem/operations/remove_all.cc:
	Likewise.
	* testsuite/27_io/filesystem/operations/status.cc: Do not test
	permissions on mingw targets.
	* testsuite/27_io/filesystem/operations/weakly_canonical.cc: Do not
	test symlinks on mingw targets.
	* testsuite/experimental/filesystem/operations/space.cc: Fix test
	for mingw targets.

From-SVN: r267991
This commit is contained in:
Jonathan Wakely 2019-01-16 23:11:10 +00:00 committed by Jonathan Wakely
parent a6804ea929
commit edfe833a31
23 changed files with 202 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,47 @@
2019-01-16 Jonathan Wakely <jwakely@redhat.com>
* config/abi/pre/gnu.ver (GLIBCXX_3.4.26): Add exports for fstream
constructors and open members taking wide strings. Fix patterns for
filesystem::path members to match wstring_view parameters. Add
exports for shared_ptr members used by directory iterators.
* src/c++17/fs_ops.cc (remove(const path&, error_code&)): Clear the
error code parameter if the file doesn't exist.
* src/filesystem/ops.cc (remove(const path&, error_code&)):
Likewise.
* testsuite/27_io/filesystem/operations/canonical.cc: Fix expected
values for mingw targets, where "/" is not an absolute path. Do not
test symlinks on mingw targets.
* testsuite/experimental/filesystem/operations/canonical.cc: Likewise.
* testsuite/27_io/filesystem/operations/copy.cc: Do not test symlinks
on mingw targets.
* testsuite/experimental/filesystem/operations/copy.cc: Likewise.
* testsuite/27_io/filesystem/operations/create_directories.cc: Check
that each component of the path is created.
* testsuite/experimental/filesystem/operations/create_directories.cc:
Likewise.
* testsuite/27_io/filesystem/operations/exists.cc: Do not test
permissions on mingw targets.
* testsuite/experimental/filesystem/operations/exists.cc: Likewise.
* testsuite/27_io/filesystem/operations/is_empty.cc: Likewise.
* testsuite/experimental/filesystem/operations/is_empty.cc: Likewise.
* testsuite/27_io/filesystem/operations/permissions.cc: XFAIL for
mingw targets.
* testsuite/experimental/filesystem/operations/permissions.cc:
Likewise.
* testsuite/27_io/filesystem/operations/remove.cc: Do not test
symlinks or permissions on mingw targets.
* testsuite/experimental/filesystem/operations/remove.cc: Likewise.
* testsuite/27_io/filesystem/operations/remove_all.cc: Do not test
symlinks on mingw targets.
* testsuite/experimental/filesystem/operations/remove_all.cc:
Likewise.
* testsuite/27_io/filesystem/operations/status.cc: Do not test
permissions on mingw targets.
* testsuite/27_io/filesystem/operations/weakly_canonical.cc: Do not
test symlinks on mingw targets.
* testsuite/experimental/filesystem/operations/space.cc: Fix test
for mingw targets.
2019-02-14 Ulrich Drepper <drepper@redhat.com>
PR libstdc++/88738

22
libstdc++-v3/config/abi/pre/gnu.ver
View File

@ -2060,6 +2060,10 @@ GLIBCXX_3.4.26 {
_ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreExt;
# std::basic_filebuf::open(const wchar_t*, openmode)
_ZNSt13basic_filebufI[cw]St11char_traitsI[cw]EE4openEPKwSt13_Ios_Openmode;
_ZNSt13basic_fstreamI[cw]St11char_traitsI[cw]EEC[12]EPKwSt13_Ios_Openmode;
_ZNSt13basic_fstreamI[cw]St11char_traitsI[cw]EE4openEPKwSt13_Ios_Openmode;
_ZNSt14basic_[io]fstreamI[cw]St11char_traitsI[cw]EEC[12]EPKwSt13_Ios_Openmode;
_ZNSt14basic_[io]fstreamI[cw]St11char_traitsI[cw]EE4openEPKwSt13_Ios_Openmode;
_ZN11__gnu_debug25_Safe_local_iterator_base16_M_attach_singleEPNS_19_Safe_sequence_baseEb;
@ -2122,7 +2126,7 @@ GLIBCXX_3.4.26 {
_ZNKSt10filesystem4path5_List3endEv;
_ZNKSt10filesystem4path5_List5beginEv;
_ZNKSt10filesystem4path7compareERKS0_;
_ZNKSt10filesystem4path7compareESt17basic_string_viewIcSt11char_traitsIcEE;
_ZNKSt10filesystem4path7compareESt17basic_string_viewI[cw]St11char_traitsI[cw]EE;
_ZNKSt10filesystem4path9root_*Ev;
_ZNSt10filesystem10hash_valueERKNS_4pathE;
_ZNSt10filesystem16filesystem_errorC[12]E*;
@ -2132,8 +2136,8 @@ GLIBCXX_3.4.26 {
_ZNSt10filesystem4path1[567]re*;
_ZNSt10filesystem4path5_ListC1ERKS1_;
_ZNSt10filesystem4path5_ListC1Ev;
_ZNSt10filesystem4path9_M_appendESt17basic_string_viewIcSt11char_traitsIcEE;
_ZNSt10filesystem4path9_M_concatESt17basic_string_viewIcSt11char_traitsIcEE;
_ZNSt10filesystem4path9_M_appendESt17basic_string_viewI[cw]St11char_traitsI[cw]EE;
_ZNSt10filesystem4path9_M_concatESt17basic_string_viewI[cw]St11char_traitsI[cw]EE;
_ZNSt10filesystem4pathaSERKS0_;
_ZNSt10filesystem4pathdVERKS0_;
_ZNSt10filesystem4pathpLERKS0_;
@ -2148,7 +2152,7 @@ GLIBCXX_3.4.26 {
_ZNKSt10filesystem7__cxx114path5_List3endEv;
_ZNKSt10filesystem7__cxx114path5_List5beginEv;
_ZNKSt10filesystem7__cxx114path7compareERKS1_;
_ZNKSt10filesystem7__cxx114path7compareESt17basic_string_viewIcSt11char_traitsIcEE;
_ZNKSt10filesystem7__cxx114path7compareESt17basic_string_viewI[cw]St11char_traitsI[cw]EE;
_ZNKSt10filesystem7__cxx114path9root_*Ev;
_ZNSt10filesystem7__cxx1110hash_valueERKNS0_4pathE;
_ZNSt10filesystem7__cxx1116filesystem_errorC[12]E*;
@ -2158,8 +2162,8 @@ GLIBCXX_3.4.26 {
_ZNSt10filesystem7__cxx114path1[567]re*;
_ZNSt10filesystem7__cxx114path5_ListC1ERKS2_;
_ZNSt10filesystem7__cxx114path5_ListC1Ev;
_ZNSt10filesystem7__cxx114path9_M_appendESt17basic_string_viewIcSt11char_traitsIcEE;
_ZNSt10filesystem7__cxx114path9_M_concatESt17basic_string_viewIcSt11char_traitsIcEE;
_ZNSt10filesystem7__cxx114path9_M_appendESt17basic_string_viewI[cw]St11char_traitsI[cw]EE;
_ZNSt10filesystem7__cxx114path9_M_concatESt17basic_string_viewI[cw]St11char_traitsI[cw]EE;
_ZNSt10filesystem7__cxx114pathaSERKS1_;
_ZNSt10filesystem7__cxx114pathdVERKS1_;
_ZNSt10filesystem7__cxx114pathpLERKS1_;
@ -2221,6 +2225,12 @@ GLIBCXX_3.4.26 {
_ZNSt10filesystem7__cxx1128recursive_directory_iteratoraSEOS1_;
_ZNSt10filesystem7__cxx1128recursive_directory_iteratorppEv;
_ZNSt12__shared_ptrINSt10filesystem7__cxx114_DirELN9__gnu_cxx12_Lock_policyE2EEC1Ev;
_ZNSt12__shared_ptrINSt10filesystem7__cxx114_DirELN9__gnu_cxx12_Lock_policyE2EEC1EOS5_;
_ZNSt12__shared_ptrINSt10filesystem7__cxx114_DirELN9__gnu_cxx12_Lock_policyE2EEaSEOS5_;
_ZNSt12__shared_ptrINSt10filesystem7__cxx1128recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE2EEC1Ev;
_ZNSt12__shared_ptrINSt10filesystem7__cxx1128recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE2EEC1EOS6_;
# basic_ostream::operator<<(nullptr_t)
_ZNSolsEDn;
_ZNSt13basic_ostreamIwSt11char_traitsIwEElsEDn;

5
libstdc++-v3/src/c++17/fs_ops.cc
View File

@ -1175,7 +1175,8 @@ bool
fs::remove(const path& p, error_code& ec) noexcept
{
#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
if (exists(symlink_status(p, ec)))
auto st = symlink_status(p, ec);
if (exists(st))
{
if ((is_directory(p, ec) && RemoveDirectoryW(p.c_str()))
|| DeleteFileW(p.c_str()))
@ -1186,6 +1187,8 @@ fs::remove(const path& p, error_code& ec) noexcept
else if (!ec)
ec.assign((int)GetLastError(), generic_category());
}
else if (status_known(st))
ec.clear();
#else
if (::remove(p.c_str()) == 0)
{

5
libstdc++-v3/src/filesystem/ops.cc
View File

@ -1045,7 +1045,8 @@ bool
fs::remove(const path& p, error_code& ec) noexcept
{
#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
if (exists(symlink_status(p, ec)))
auto st = symlink_status(p, ec);
if (exists(st))
{
if ((is_directory(p, ec) && RemoveDirectoryW(p.c_str()))
|| DeleteFileW(p.c_str()))
@ -1056,6 +1057,8 @@ fs::remove(const path& p, error_code& ec) noexcept
else if (!ec)
ec.assign((int)GetLastError(), generic_category());
}
else if (status_known(st))
ec.clear();
#else
if (::remove(p.c_str()) == 0)
{

27
libstdc++-v3/testsuite/27_io/filesystem/operations/canonical.cc
View File

@ -52,28 +52,30 @@ test01()
compare_paths( p2, p );
VERIFY( !ec );
const auto root = fs::absolute("/");
ec = bad_ec;
p = "/";
p = canonical( p, ec );
compare_paths( p, "/" );
compare_paths( p, root );
VERIFY( !ec );
ec = bad_ec;
p = "/.";
p = canonical( p, ec );
compare_paths( p, "/" );
compare_paths( p, root );
VERIFY( !ec );
ec = bad_ec;
p = "/..";
p = canonical( p, ec );
compare_paths( p, "/" );
compare_paths( p, root );
VERIFY( !ec );
ec = bad_ec;
p = "/../.././.";
p = canonical( p, ec );
compare_paths( p, "/" );
compare_paths( p, root );
VERIFY( !ec );
}
@ -101,7 +103,6 @@ test02()
#endif
}
void
test03()
{
@ -111,22 +112,28 @@ test03()
fs::path foo = dir/"foo", bar = dir/"bar";
fs::create_directory(foo);
fs::create_directory(bar);
#if defined(__MINGW32__) || defined(__MINGW64__)
// No symlink support
const fs::path baz = dir/"foo\\\\..\\bar///";
#else
fs::create_symlink("../bar", foo/"baz");
const fs::path baz = dir/"foo//./baz///";
#endif
auto dirc = canonical(dir);
auto barc = canonical(bar);
auto p1 = fs::canonical(dir/"foo//.///..//./");
compare_paths( p1, dirc );
auto p2 = fs::canonical(dir/"foo//./baz///..//./");
auto p2 = fs::canonical(baz/"..//./");
compare_paths( p2, dirc );
auto p3 = fs::canonical(dir/"foo//./baz////./");
auto p3 = fs::canonical(baz/"./");
compare_paths( p3, barc );
auto p4 = fs::canonical(dir/"foo//./baz///..//./bar");
auto p4 = fs::canonical(baz/"..//./bar");
compare_paths( p4, barc );
auto p5 = fs::canonical(dir/"foo//./baz///..//./bar/");
auto p5 = fs::canonical(baz/"..//./bar/");
compare_paths( p5, p4 );
auto p6 = fs::canonical(dir/"foo//./baz///..//./bar/.");
auto p6 = fs::canonical(baz/"..//./bar/.");
compare_paths( p6, p4 );
remove_all(dir);

5
libstdc++-v3/testsuite/27_io/filesystem/operations/copy.cc
View File

@ -67,6 +67,11 @@ test01()
void
test02()
{
#if defined(__MINGW32__) || defined(__MINGW64__)
// No symlink support
return;
#endif
const std::error_code bad_ec = make_error_code(std::errc::invalid_argument);
auto from = __gnu_test::nonexistent_path();
auto to = __gnu_test::nonexistent_path();

2
libstdc++-v3/testsuite/27_io/filesystem/operations/create_directories.cc
View File

@ -70,6 +70,8 @@ test01()
b = fs::create_directories( p/"./d4/../d5", ec );
VERIFY( !ec );
VERIFY( b );
VERIFY( is_directory(p/"d4") );
VERIFY( is_directory(p/"d5") );
VERIFY( is_directory(p/"./d4/../d5") );
std::uintmax_t count = remove_all(p, ec);

5
libstdc++-v3/testsuite/27_io/filesystem/operations/exists.cc
View File

@ -80,6 +80,11 @@ test03()
void
test04()
{
#if defined(__MINGW32__) || defined(__MINGW64__)
// filesystem permissions not supported
return;
#endif
using std::filesystem::perms;
using std::filesystem::perm_options;
path p = __gnu_test::nonexistent_path();

5
libstdc++-v3/testsuite/27_io/filesystem/operations/is_empty.cc
View File

@ -28,6 +28,11 @@ namespace fs = std::filesystem;
void
test01()
{
#if defined(__MINGW32__) || defined(__MINGW64__)
// filesystem permissions not supported
return;
#endif
auto p = __gnu_test::nonexistent_path();
create_directory(p);
permissions(p, fs::perms::none);

1
libstdc++-v3/testsuite/27_io/filesystem/operations/permissions.cc
View File

@ -18,6 +18,7 @@
// { dg-options "-std=gnu++17" }
// { dg-do run { target c++17 } }
// { dg-require-filesystem-ts "" }
// { dg-xfail-if "permissions not supported" { *-*-mingw* } }
// C++17 30.10.14.26 Permissions [fs.op.permissions]

8
libstdc++-v3/testsuite/27_io/filesystem/operations/remove.cc
View File

@ -42,6 +42,9 @@ test01()
VERIFY( !ec );
VERIFY( !n );
#if defined(__MINGW32__) || defined(__MINGW64__)
// No symlink support
#else
auto link = __gnu_test::nonexistent_path();
create_symlink(p, link); // dangling symlink
ec = bad_ec;
@ -64,6 +67,7 @@ test01()
VERIFY( !ec );
VERIFY( n );
VERIFY( !exists(symlink_status(p)) );
#endif
const auto dir = __gnu_test::nonexistent_path();
create_directories(dir/"a/b");
@ -73,6 +77,9 @@ test01()
VERIFY( !n );
VERIFY( exists(dir/"a/b") );
#if defined(__MINGW32__) || defined(__MINGW64__)
// No permissions support
#else
permissions(dir, fs::perms::none, ec);
if (!ec)
{
@ -82,6 +89,7 @@ test01()
VERIFY( !n );
permissions(dir, fs::perms::owner_all, ec);
}
#endif
ec = bad_ec;
n = remove(dir/"a/b", ec);

4
libstdc++-v3/testsuite/27_io/filesystem/operations/remove_all.cc
View File

@ -42,6 +42,9 @@ test01()
VERIFY( !ec );
VERIFY( n == 0 );
#if defined(__MINGW32__) || defined(__MINGW64__)
// No symlink support
#else
auto link = __gnu_test::nonexistent_path();
create_symlink(p, link); // dangling symlink
ec = bad_ec;
@ -58,6 +61,7 @@ test01()
VERIFY( n == 1 );
VERIFY( !exists(symlink_status(link)) ); // The symlink is removed, but
VERIFY( exists(p) ); // its target is not.
#endif
const auto dir = __gnu_test::nonexistent_path();
create_directories(dir/"a/b/c");

5
libstdc++-v3/testsuite/27_io/filesystem/operations/status.cc
View File

@ -56,6 +56,11 @@ test02()
void
test03()
{
#if defined(__MINGW32__) || defined(__MINGW64__)
// No permissions support
return;
#endif
fs::path dir = __gnu_test::nonexistent_path();
fs::create_directory(dir);
__gnu_test::scoped_file d(dir, __gnu_test::scoped_file::adopt_file);

37
libstdc++-v3/testsuite/27_io/filesystem/operations/weakly_canonical.cc
View File

@ -28,6 +28,9 @@ namespace fs = std::filesystem;
void
test01()
{
const std::error_code bad_ec = make_error_code(std::errc::invalid_argument);
std::error_code ec;
auto dir = __gnu_test::nonexistent_path();
fs::create_directory(dir);
const auto dirc = canonical(dir);
@ -35,18 +38,20 @@ test01()
fs::create_directory(foo);
fs::create_directory(bar);
fs::create_directory(bar/"baz");
fs::path p;
#if defined(__MINGW32__) || defined(__MINGW64__)
// No symlink support
#else
fs::create_symlink("../bar", foo/"bar");
auto p = fs::weakly_canonical(dir/"foo//./bar///../biz/.");
p = fs::weakly_canonical(dir/"foo//./bar///../biz/.");
VERIFY( p == dirc/"biz/" );
p = fs::weakly_canonical(dir/"foo/.//bar/././baz/.");
VERIFY( p == dirc/"bar/baz" );
p = fs::weakly_canonical(fs::current_path()/dir/"bar//../foo/bar/baz");
VERIFY( p == dirc/"bar/baz" );
const std::error_code bad_ec = make_error_code(std::errc::invalid_argument);
std::error_code ec;
ec = bad_ec;
p = fs::weakly_canonical(dir/"foo//./bar///../biz/.", ec);
VERIFY( !ec );
@ -59,6 +64,30 @@ test01()
p = fs::weakly_canonical(fs::current_path()/dir/"bar//../foo/bar/baz", ec);
VERIFY( !ec );
VERIFY( p == dirc/"bar/baz" );
#endif
// As above, but using "foo/.." instead of "foo",
// because there is no "foo/bar" symlink
p = fs::weakly_canonical(dir/"./bar///../biz/.");
VERIFY( p == dirc/"biz/" );
p = fs::weakly_canonical(dir/"foo/.././/bar/././baz/.");
VERIFY( p == dirc/"bar/baz" );
p = fs::weakly_canonical(fs::current_path()/dir/"bar//../foo/../bar/baz");
VERIFY( p == dirc/"bar/baz" );
ec = bad_ec;
p = fs::weakly_canonical(dir/"foo/..//./bar///../biz/.", ec);
VERIFY( !ec );
VERIFY( p == dirc/"biz/" );
ec = bad_ec;
p = fs::weakly_canonical(dir/"foo/.././/bar/././baz/.", ec);
VERIFY( !ec );
VERIFY( p == dirc/"bar/baz" );
ec = bad_ec;
p = fs::weakly_canonical(fs::current_path()/dir/"bar//../foo/../bar/baz", ec);
VERIFY( !ec );
VERIFY( p == dirc/"bar/baz" );
fs::remove_all(dir, ec);
}

10
libstdc++-v3/testsuite/experimental/filesystem/operations/canonical.cc
View File

@ -37,24 +37,26 @@ test01()
canonical( p, ec );
VERIFY( !ec );
const auto root = fs::absolute("/");
p = "/";
p = canonical( p, ec );
VERIFY( p == "/" );
VERIFY( p == root );
VERIFY( !ec );
p = "/.";
p = canonical( p, ec );
VERIFY( p == "/" );
VERIFY( p == root );
VERIFY( !ec );
p = "/..";
p = canonical( p, ec );
VERIFY( p == "/" );
VERIFY( p == root );
VERIFY( !ec );
p = "/../.././.";
p = canonical( p, ec );
VERIFY( p == "/" );
VERIFY( p == root );
VERIFY( !ec );
}

5
libstdc++-v3/testsuite/experimental/filesystem/operations/copy.cc
View File

@ -67,6 +67,11 @@ test01()
void
test02()
{
#if defined(__MINGW32__) || defined(__MINGW64__)
// No symlink support
return;
#endif
auto from = __gnu_test::nonexistent_path();
auto to = __gnu_test::nonexistent_path();
std::error_code ec, bad = std::make_error_code(std::errc::invalid_argument);

2
libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc
View File

@ -63,6 +63,8 @@ test01()
b = fs::create_directories( p/"./d4/../d5", ec );
VERIFY( !ec );
VERIFY( b );
VERIFY( is_directory(p/"d4") );
VERIFY( is_directory(p/"d5") );
VERIFY( is_directory(p/"./d4/../d5") );
std::uintmax_t count = remove_all(p, ec);

5
libstdc++-v3/testsuite/experimental/filesystem/operations/exists.cc
View File

@ -74,6 +74,11 @@ test03()
void
test04()
{
#if defined(__MINGW32__) || defined(__MINGW64__)
// filesystem permissions not supported
return;
#endif
using perms = std::experimental::filesystem::perms;
path p = __gnu_test::nonexistent_path();
create_directory(p);

5
libstdc++-v3/testsuite/experimental/filesystem/operations/is_empty.cc
View File

@ -28,6 +28,11 @@ namespace fs = std::experimental::filesystem;
void
test01()
{
#if defined(__MINGW32__) || defined(__MINGW64__)
// filesystem permissions not supported
return;
#endif
auto p = __gnu_test::nonexistent_path();
create_directory(p);
permissions(p, fs::perms::none);

1
libstdc++-v3/testsuite/experimental/filesystem/operations/permissions.cc
View File

@ -18,6 +18,7 @@
// { dg-options "-DUSE_FILESYSTEM_TS -lstdc++fs" }
// { dg-do run { target c++11 } }
// { dg-require-filesystem-ts "" }
// { dg-xfail-if "permissions not supported" { *-*-mingw* } }
// 15.26 Permissions [fs.op.permissions]

9
libstdc++-v3/testsuite/experimental/filesystem/operations/remove.cc
View File

@ -42,6 +42,10 @@ test01()
VERIFY( !ec );
VERIFY( !n );
#if defined(__MINGW32__) || defined(__MINGW64__)
// No symlink support
return;
#else
auto link = __gnu_test::nonexistent_path();
create_symlink(p, link); // dangling symlink
ec = bad_ec;
@ -64,6 +68,7 @@ test01()
VERIFY( !ec );
VERIFY( n );
VERIFY( !exists(symlink_status(p)) );
#endif
const auto dir = __gnu_test::nonexistent_path();
create_directories(dir/"a/b");
@ -73,6 +78,9 @@ test01()
VERIFY( !n );
VERIFY( exists(dir/"a/b") );
#if defined(__MINGW32__) || defined(__MINGW64__)
// No permissions support
#else
permissions(dir, fs::perms::none, ec);
if (!ec)
{
@ -82,6 +90,7 @@ test01()
VERIFY( !n );
permissions(dir, fs::perms::owner_all, ec);
}
#endif
ec = bad_ec;
n = remove(dir/"a/b", ec);

4
libstdc++-v3/testsuite/experimental/filesystem/operations/remove_all.cc
View File

@ -42,6 +42,9 @@ test01()
VERIFY( !ec );
VERIFY( n == 0 );
#if defined(__MINGW32__) || defined(__MINGW64__)
// No symlink support
#else
auto link = __gnu_test::nonexistent_path();
create_symlink(p, link); // dangling symlink
ec = bad_ec;
@ -58,6 +61,7 @@ test01()
VERIFY( n == 1 );
VERIFY( !exists(symlink_status(link)) ); // The symlink is removed, but
VERIFY( exists(p) ); // its target is not.
#endif
const auto dir = __gnu_test::nonexistent_path();
create_directories(dir/"a/b/c");

17
libstdc++-v3/testsuite/experimental/filesystem/operations/space.cc
View File

@ -27,6 +27,12 @@
namespace fs = std::experimental::filesystem;
bool check(fs::space_info const& s)
{
const std::uintmax_t err = -1;
return s.capacity != err || s.free != err || s.available != err;
}
void
test01()
{
@ -36,17 +42,18 @@ test01()
s = fs::space(root, ec);
VERIFY( !ec );
s = fs::space(__gnu_test::nonexistent_path(), ec);
VERIFY( ec );
VERIFY( s.capacity == static_cast<uintmax_t>(-1) );
VERIFY( s.free == static_cast<uintmax_t>(-1) );
VERIFY( s.available == static_cast<uintmax_t>(-1) );
s = fs::space(__gnu_test::nonexistent_path()/".", ec);
if (ec)
VERIFY( ! check(s) );
else
VERIFY( check(s) );
}
void
test02()
{
fs::space_info s = fs::space(".");
VERIFY( check(s) );
VERIFY( s.capacity >= s.free );
}