This is an archive of the discontinued LLVM Phabricator instance.

Differential D89538

[libcxx] [test] Use fs::path::string_type instead of std::string in fs.op.relative
ClosedPublic

Authored by mstorsjo on Oct 16 2020, 3:45 AM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rG701fa703fc77: [libcxx] [test] Use fs::path::string_type instead of std::string in fs.op.

Diff Detail

Event Timeline

mstorsjo created this revision.Oct 16 2020, 3:45 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 16 2020, 3:45 AM
Herald added 1 blocking reviewer(s): Restricted Project. · View Herald Transcript
mstorsjo requested review of this revision.Oct 16 2020, 3:45 AM
Harbormaster completed remote builds in B75288: Diff 298588.Oct 16 2020, 3:54 AM
ldionne accepted this revision.Oct 16 2020, 5:37 AM
This revision is now accepted and ready to land.Oct 16 2020, 5:37 AM
Herald added a subscriber: dexonsmith. · View Herald TranscriptOct 16 2020, 5:37 AM
Closed by commit rG701fa703fc77: [libcxx] [test] Use fs::path::string_type instead of std::string in fs.op. (authored by mstorsjo). · Explain WhyOct 16 2020, 7:37 AM
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rG701fa703fc77: [libcxx] [test] Use fs::path::string_type instead of std::string in fs.op..

Revision Contents

PathSize
libcxx/
test/
std/
input.output/
filesystems/
fs.op.funcs/
fs.op.relative/
28 lines

Diff 298588

libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.relative/relative.pass.cpp

Show All 25 Lines
#include "filesystem_test_helper.h" #include "filesystem_test_helper.h"
TEST_SUITE(filesystem_proximate_path_test_suite) TEST_SUITE(filesystem_proximate_path_test_suite)
TEST_CASE(test_signature_0) { TEST_CASE(test_signature_0) {
fs::path p(""); fs::path p("");
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(fs::current_path())); TEST_CHECK(output == fs::path::string_type(fs::current_path()));
} }
TEST_CASE(test_signature_1) { TEST_CASE(test_signature_1) {
fs::path p("."); fs::path p(".");
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(fs::current_path())); TEST_CHECK(output == fs::path::string_type(fs::current_path()));
} }
TEST_CASE(test_signature_2) { TEST_CASE(test_signature_2) {
static_test_env static_env; static_test_env static_env;
fs::path p(static_env.File); fs::path p(static_env.File);
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(static_env.File)); TEST_CHECK(output == fs::path::string_type(static_env.File));
} }
TEST_CASE(test_signature_3) { TEST_CASE(test_signature_3) {
static_test_env static_env; static_test_env static_env;
fs::path p(static_env.Dir); fs::path p(static_env.Dir);
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(static_env.Dir)); TEST_CHECK(output == fs::path::string_type(static_env.Dir));
} }
TEST_CASE(test_signature_4) { TEST_CASE(test_signature_4) {
static_test_env static_env; static_test_env static_env;
fs::path p(static_env.SymlinkToDir); fs::path p(static_env.SymlinkToDir);
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(static_env.Dir)); TEST_CHECK(output == fs::path::string_type(static_env.Dir));
} }
TEST_CASE(test_signature_5) { TEST_CASE(test_signature_5) {
static_test_env static_env; static_test_env static_env;
fs::path p(static_env.SymlinkToDir / "dir2/."); fs::path p(static_env.SymlinkToDir / "dir2/.");
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(static_env.Dir / "dir2")); TEST_CHECK(output == fs::path::string_type(static_env.Dir / "dir2"));
} }
TEST_CASE(test_signature_6) { TEST_CASE(test_signature_6) {
static_test_env static_env; static_test_env static_env;
// FIXME? If the trailing separator occurs in a part of the path that exists, // 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. // it is omitted. Otherwise it is added to the end of the result.
fs::path p(static_env.SymlinkToDir / "dir2/./"); fs::path p(static_env.SymlinkToDir / "dir2/./");
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(static_env.Dir / "dir2")); TEST_CHECK(output == fs::path::string_type(static_env.Dir / "dir2"));
} }
TEST_CASE(test_signature_7) { TEST_CASE(test_signature_7) {
static_test_env static_env; static_test_env static_env;
fs::path p(static_env.SymlinkToDir / "dir2/DNE/./"); fs::path p(static_env.SymlinkToDir / "dir2/DNE/./");
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(static_env.Dir / "dir2/DNE/")); TEST_CHECK(output == fs::path::string_type(static_env.Dir / "dir2/DNE/"));
} }
TEST_CASE(test_signature_8) { TEST_CASE(test_signature_8) {
static_test_env static_env; static_test_env static_env;
fs::path p(static_env.SymlinkToDir / "dir2"); fs::path p(static_env.SymlinkToDir / "dir2");
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(static_env.Dir2)); TEST_CHECK(output == fs::path::string_type(static_env.Dir2));
} }
TEST_CASE(test_signature_9) { TEST_CASE(test_signature_9) {
static_test_env static_env; static_test_env static_env;
fs::path p(static_env.SymlinkToDir / "dir2/../dir2/DNE/.."); fs::path p(static_env.SymlinkToDir / "dir2/../dir2/DNE/..");
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(static_env.Dir2 / "")); TEST_CHECK(output == fs::path::string_type(static_env.Dir2 / ""));
} }
TEST_CASE(test_signature_10) { TEST_CASE(test_signature_10) {
static_test_env static_env; static_test_env static_env;
fs::path p(static_env.SymlinkToDir / "dir2/dir3/../DNE/DNE2"); fs::path p(static_env.SymlinkToDir / "dir2/dir3/../DNE/DNE2");
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(static_env.Dir2 / "DNE/DNE2")); TEST_CHECK(output == fs::path::string_type(static_env.Dir2 / "DNE/DNE2"));
} }
TEST_CASE(test_signature_11) { TEST_CASE(test_signature_11) {
static_test_env static_env; static_test_env static_env;
fs::path p(static_env.Dir / "../dir1"); fs::path p(static_env.Dir / "../dir1");
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(static_env.Dir)); TEST_CHECK(output == fs::path::string_type(static_env.Dir));
} }
TEST_CASE(test_signature_12) { TEST_CASE(test_signature_12) {
static_test_env static_env; static_test_env static_env;
fs::path p(static_env.Dir / "./."); fs::path p(static_env.Dir / "./.");
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(static_env.Dir)); TEST_CHECK(output == fs::path::string_type(static_env.Dir));
} }
TEST_CASE(test_signature_13) { TEST_CASE(test_signature_13) {
static_test_env static_env; static_test_env static_env;
fs::path p(static_env.Dir / "DNE/../foo"); fs::path p(static_env.Dir / "DNE/../foo");
const fs::path output = fs::weakly_canonical(p); const fs::path output = fs::weakly_canonical(p);
TEST_CHECK(output == std::string(static_env.Dir / "foo")); TEST_CHECK(output == fs::path::string_type(static_env.Dir / "foo"));
} }
TEST_SUITE_END() TEST_SUITE_END()