diff options
Diffstat (limited to 'libcxx/test/std')
7 files changed, 48 insertions, 32 deletions
diff --git a/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.mods/refresh.pass.cpp b/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.mods/refresh.pass.cpp index 40d2cef1da1..74c73f030c9 100644 --- a/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.mods/refresh.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.mods/refresh.pass.cpp @@ -168,7 +168,8 @@ TEST_CASE(refresh_cannot_resolve) { TEST_CHECK(ErrorIs(ec, std::errc::permission_denied)); TEST_CHECK(ent.path() == file); - ExceptionChecker Checker(file, std::errc::permission_denied); + ExceptionChecker Checker(file, std::errc::permission_denied, + "directory_entry::refresh"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.refresh()); } permissions(dir, old_perms); @@ -182,7 +183,8 @@ TEST_CASE(refresh_cannot_resolve) { TEST_CHECK(ErrorIs(ec, std::errc::permission_denied)); TEST_CHECK(ent.path() == sym_in_dir); - ExceptionChecker Checker(sym_in_dir, std::errc::permission_denied); + ExceptionChecker Checker(sym_in_dir, std::errc::permission_denied, + "directory_entry::refresh"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.refresh()); } permissions(dir, old_perms); diff --git a/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/file_size.pass.cpp b/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/file_size.pass.cpp index d5050edc71f..a38b10c00fc 100644 --- a/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/file_size.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/file_size.pass.cpp @@ -102,7 +102,7 @@ TEST_CASE(not_regular_file) { TEST_CHECK(ec == other_ec); TEST_CHECK(ErrorIs(ec, TC.expected_err)); - ExceptionChecker Checker(p, TC.expected_err); + ExceptionChecker Checker(p, TC.expected_err, "directory_entry::file_size"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.file_size()); } } @@ -134,7 +134,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ErrorIs(ec, std::errc::no_such_file_or_directory)); ExceptionChecker Checker(StaticEnv::DNE, - std::errc::no_such_file_or_directory); + std::errc::no_such_file_or_directory, + "directory_entry::file_size"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.file_size()); } // test a dead symlink @@ -156,7 +157,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ErrorIs(ec, std::errc::no_such_file_or_directory)); ExceptionChecker Checker(StaticEnv::BadSymlink, - std::errc::no_such_file_or_directory); + std::errc::no_such_file_or_directory, + "directory_entry::file_size"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.file_size()); } // test a file w/o appropriate permissions. @@ -174,7 +176,7 @@ TEST_CASE(error_reporting) { TEST_CHECK(ent.file_size(ec) == uintmax_t(-1)); TEST_CHECK(ErrorIs(ec, std::errc::permission_denied)); - ExceptionChecker Checker(file, std::errc::permission_denied); + ExceptionChecker Checker(file, std::errc::permission_denied, "file_size"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.file_size()); permissions(dir, old_perms); @@ -199,7 +201,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ent.file_size(ec) == uintmax_t(-1)); TEST_CHECK(ErrorIs(ec, std::errc::permission_denied)); - ExceptionChecker Checker(sym_in_dir, std::errc::permission_denied); + ExceptionChecker Checker(sym_in_dir, std::errc::permission_denied, + "file_size"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.file_size()); permissions(dir, old_perms); @@ -224,7 +227,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ent.file_size(ec) == uintmax_t(-1)); TEST_CHECK(ErrorIs(ec, std::errc::permission_denied)); - ExceptionChecker Checker(sym_out_of_dir, std::errc::permission_denied); + ExceptionChecker Checker(sym_out_of_dir, std::errc::permission_denied, + "file_size"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.file_size()); permissions(dir, old_perms); diff --git a/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp b/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp index 0ec801bb4bf..d11457d20ae 100644 --- a/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp @@ -133,7 +133,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ErrorIs(ec, std::errc::no_such_file_or_directory)); ExceptionChecker Checker(StaticEnv::DNE, - std::errc::no_such_file_or_directory); + std::errc::no_such_file_or_directory, + "directory_entry::hard_link_count"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.hard_link_count()); } // test a dead symlink @@ -155,7 +156,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ErrorIs(ec, std::errc::no_such_file_or_directory)); ExceptionChecker Checker(StaticEnv::BadSymlink, - std::errc::no_such_file_or_directory); + std::errc::no_such_file_or_directory, + "directory_entry::hard_link_count"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.hard_link_count()); } // test a file w/o appropriate permissions. @@ -173,7 +175,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ent.hard_link_count(ec) == uintmax_t(-1)); TEST_CHECK(ErrorIs(ec, std::errc::permission_denied)); - ExceptionChecker Checker(file, std::errc::permission_denied); + ExceptionChecker Checker(file, std::errc::permission_denied, + "hard_link_count"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.hard_link_count()); permissions(dir, old_perms); @@ -198,7 +201,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ent.hard_link_count(ec) == uintmax_t(-1)); TEST_CHECK(ErrorIs(ec, std::errc::permission_denied)); - ExceptionChecker Checker(sym_in_dir, std::errc::permission_denied); + ExceptionChecker Checker(sym_in_dir, std::errc::permission_denied, + "hard_link_count"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.hard_link_count()); permissions(dir, old_perms); @@ -223,7 +227,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ent.hard_link_count(ec) == uintmax_t(-1)); TEST_CHECK(ErrorIs(ec, std::errc::permission_denied)); - ExceptionChecker Checker(sym_out_of_dir, std::errc::permission_denied); + ExceptionChecker Checker(sym_out_of_dir, std::errc::permission_denied, + "hard_link_count"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.hard_link_count()); permissions(dir, old_perms); diff --git a/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp b/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp index 250dc6f5a11..3d519728c50 100644 --- a/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp @@ -106,7 +106,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ErrorIs(ec, std::errc::no_such_file_or_directory)); ExceptionChecker Checker(StaticEnv::DNE, - std::errc::no_such_file_or_directory); + std::errc::no_such_file_or_directory, + "directory_entry::last_write_time"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.last_write_time()); } // test a dead symlink @@ -128,7 +129,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ErrorIs(ec, std::errc::no_such_file_or_directory)); ExceptionChecker Checker(StaticEnv::BadSymlink, - std::errc::no_such_file_or_directory); + std::errc::no_such_file_or_directory, + "directory_entry::last_write_time"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.last_write_time()); } // test a file w/o appropriate permissions. @@ -146,7 +148,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ent.last_write_time(ec) == file_time_type::min()); TEST_CHECK(ErrorIs(ec, std::errc::permission_denied)); - ExceptionChecker Checker(file, std::errc::permission_denied); + ExceptionChecker Checker(file, std::errc::permission_denied, + "last_write_time"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.last_write_time()); permissions(dir, old_perms); @@ -171,7 +174,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ent.last_write_time(ec) == file_time_type::min()); TEST_CHECK(ErrorIs(ec, std::errc::permission_denied)); - ExceptionChecker Checker(sym_in_dir, std::errc::permission_denied); + ExceptionChecker Checker(sym_in_dir, std::errc::permission_denied, + "last_write_time"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.last_write_time()); permissions(dir, old_perms); @@ -196,7 +200,8 @@ TEST_CASE(error_reporting) { TEST_CHECK(ent.last_write_time(ec) == file_time_type::min()); TEST_CHECK(ErrorIs(ec, std::errc::permission_denied)); - ExceptionChecker Checker(sym_out_of_dir, std::errc::permission_denied); + ExceptionChecker Checker(sym_out_of_dir, std::errc::permission_denied, + "last_write_time"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ent.last_write_time()); permissions(dir, old_perms); diff --git a/libcxx/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp b/libcxx/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp index 1699a414af1..830f4a9436d 100644 --- a/libcxx/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp @@ -25,6 +25,8 @@ #include "rapid-cxx-test.hpp" #include "filesystem_test_helper.hpp" +#include <iostream> + using namespace fs; TEST_SUITE(recursive_directory_iterator_increment_tests) @@ -290,18 +292,15 @@ TEST_CASE(test_PR35078) } { bool SeenNestedFile = false; - recursive_directory_iterator it = SetupState(true, SeenNestedFile); + recursive_directory_iterator it = SetupState(false, SeenNestedFile); TEST_REQUIRE(it != endIt); TEST_REQUIRE(*it == nestedDir); - ec = GetTestEC(); - it.increment(ec); - TEST_CHECK(!ec); - if (SeenNestedFile) { - TEST_CHECK(it == endIt); - } else { - TEST_REQUIRE(it != endIt); - TEST_CHECK(*it == nestedFile); - } + + ExceptionChecker Checker(std::errc::permission_denied, + "recursive_directory_iterator::operator++()", + format_string("attempting recursion into \"%s\"", + nestedDir.native())); + TEST_CHECK_THROW_RESULT(filesystem_error, Checker, ++it); } } 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 3c2543ab942..5f023743a43 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 @@ -64,7 +64,7 @@ TEST_CASE(test_error_reporting) { TEST_CHECK(fs::copy_file(file, file, copy_options::overwrite_existing, ec) == false); TEST_CHECK(ErrorIs(ec, std::errc::file_exists)); - ExceptionChecker Checker(file, file, std::errc::file_exists); + ExceptionChecker Checker(file, file, std::errc::file_exists, "copy_file"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, copy_file(file, file, copy_options::overwrite_existing)); } @@ -72,7 +72,7 @@ TEST_CASE(test_error_reporting) { std::error_code ec; TEST_CHECK(fs::copy_file(file, file2, ec) == false); TEST_CHECK(ErrorIs(ec, std::errc::file_exists)); - ExceptionChecker Checker(file, file, std::errc::file_exists); + ExceptionChecker Checker(file, file, std::errc::file_exists, "copy_file"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, copy_file(file, file, copy_options::overwrite_existing)); } diff --git a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.file_size/file_size.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.file_size/file_size.pass.cpp index e2b2513ecdb..c79012d9e13 100644 --- a/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.file_size/file_size.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/fs.op.funcs/fs.op.file_size/file_size.pass.cpp @@ -69,14 +69,15 @@ TEST_CASE(file_size_error_cases) {StaticEnv::Dir, std::errc::is_a_directory}, {StaticEnv::SymlinkToDir, std::errc::is_a_directory}, {StaticEnv::BadSymlink, std::errc::no_such_file_or_directory}, - {StaticEnv::DNE, std::errc::no_such_file_or_directory}}; + {StaticEnv::DNE, std::errc::no_such_file_or_directory}, + {"", std::errc::no_such_file_or_directory}}; const uintmax_t expect = static_cast<uintmax_t>(-1); for (auto& TC : TestCases) { std::error_code ec = GetTestEC(); TEST_CHECK(file_size(TC.p, ec) == expect); TEST_CHECK(ErrorIs(ec, TC.expected_err)); - ExceptionChecker Checker(TC.p, TC.expected_err); + ExceptionChecker Checker(TC.p, TC.expected_err, "file_size"); TEST_CHECK_THROW_RESULT(filesystem_error, Checker, file_size(TC.p)); } } |
