diff options
Diffstat (limited to 'libcxx/test/std/experimental/filesystem/fs.op.funcs')
13 files changed, 11 insertions, 47 deletions
diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp index db10da092ef..c9b42b3596a 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy/copy.pass.cpp @@ -60,6 +60,7 @@ TEST_CASE(test_error_reporting) && err.code() == ec; } #else + ((void)f); ((void)t); ((void)ec); return true; #endif }; diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp index 1b56c709797..8c5241c71af 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp @@ -62,6 +62,7 @@ TEST_CASE(test_error_reporting) && err.code() == ec; } #else + ((void)f); ((void)t); ((void)ec); return true; #endif }; @@ -138,7 +139,6 @@ TEST_CASE(test_attributes_get_copied) const path file = env.create_file("file1", 42); const path dest = env.make_env_path("file2"); auto st = status(file); - perms default_perms = st.permissions(); perms new_perms = perms::owner_read; permissions(file, new_perms); std::error_code ec; diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp index 6fae1119520..fe472980677 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp @@ -50,6 +50,7 @@ TEST_CASE(test_error_reporting) && err.code() == ec; } #else + ((void)f); ((void)t); ((void)ec); return true; #endif }; diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp index e0473754cc8..85a3b6cb346 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp @@ -37,21 +37,6 @@ TEST_CASE(test_signatures) TEST_CASE(test_error_reporting) { - auto checkThrow = [](path const& f, path const& t, const std::error_code& ec) - { -#ifndef TEST_HAS_NO_EXCEPTIONS - try { - fs::create_directory_symlink(f, t); - return true; - } catch (filesystem_error const& err) { - return err.path1() == f - && err.code() == ec; - } -#else - return true; -#endif - }; - scoped_test_env env; const path file = env.create_file("file1", 42); const path file2 = env.create_file("file2", 55); diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp index 4a865fdee7e..7aefece46a4 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp @@ -36,21 +36,6 @@ TEST_CASE(test_signatures) TEST_CASE(test_error_reporting) { - auto checkThrow = [](path const& f, path const& t, const std::error_code& ec) - { -#ifndef TEST_HAS_NO_EXCEPTIONS - try { - fs::create_hard_link(f, t); - return true; - } catch (filesystem_error const& err) { - return err.path1() == f - && err.code() == ec; - } -#else - return true; -#endif - }; - scoped_test_env env; const path file = env.create_file("file1", 42); const path file2 = env.create_file("file2", 55); diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp index 35ba57f3ab4..d261d987a1e 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp @@ -37,21 +37,6 @@ TEST_CASE(test_signatures) TEST_CASE(test_error_reporting) { - auto checkThrow = [](path const& f, path const& t, const std::error_code& ec) - { -#ifndef TEST_HAS_NO_EXCEPTIONS - try { - fs::create_symlink(f, t); - return true; - } catch (filesystem_error const& err) { - return err.path1() == f - && err.code() == ec; - } -#else - return true; -#endif - }; - scoped_test_env env; const path file = env.create_file("file1", 42); const path file2 = env.create_file("file2", 55); diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.permissions/permissions.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.permissions/permissions.pass.cpp index 8c7c0a78ad5..4177392141e 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.permissions/permissions.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.permissions/permissions.pass.cpp @@ -53,6 +53,7 @@ TEST_CASE(test_error_reporting) && err.code() == ec; } #else + ((void)f); ((void)opts); ((void)ec); return true; #endif }; @@ -116,7 +117,7 @@ TEST_CASE(basic_permissions_test) permissions(TC.p, TC.set_perms, ec); TEST_CHECK(!ec); auto pp = status(TC.p).permissions(); - TEST_CHECK(status(TC.p).permissions() == TC.expected); + TEST_CHECK(pp == TC.expected); } } diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp index 00581cbe8bc..d69e95ce5d5 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp @@ -51,6 +51,7 @@ TEST_CASE(test_error_reporting) && err.code() == ec; } #else + ((void)f); ((void)ec); return true; #endif }; diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove/remove.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove/remove.pass.cpp index edb0c4fc76c..f7ce8a30e64 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove/remove.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove/remove.pass.cpp @@ -50,6 +50,7 @@ TEST_CASE(test_error_reporting) && err.code() == ec; } #else + ((void)f); ((void)ec); return true; #endif }; diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp index aecfce7885e..b84c18c1da0 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp @@ -50,6 +50,7 @@ TEST_CASE(test_error_reporting) && err.code() == ec; } #else + ((void)f); ((void)ec); return true; #endif }; diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.rename/rename.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.rename/rename.pass.cpp index c2ae854c0bf..e265c7af6b1 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.rename/rename.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.rename/rename.pass.cpp @@ -50,6 +50,7 @@ TEST_CASE(test_error_reporting) && err.code() == ec; } #else + ((void)f); ((void)t); ((void)ec); return true; #endif }; diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp index 8a6aa09b14c..f7c2ee14e83 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp @@ -52,6 +52,7 @@ TEST_CASE(test_error_reporting) && err.code() == ec; } #else + ((void)f); ((void)s); ((void)ec); return true; #endif }; diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.space/space.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.space/space.pass.cpp index 865191520be..8f241810fc7 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.space/space.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.space/space.pass.cpp @@ -57,6 +57,7 @@ TEST_CASE(test_error_reporting) && err.code() == ec; } #else + ((void)f); ((void)ec); return true; #endif }; |
