diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-08-18 09:23:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 09:23:01 -0700 |
| commit | 0bb8780a60e67320a966421e2923595fa57cbf22 (patch) | |
| tree | 494b4a99592f5bd17195397ae3acd37d38fa9dc6 /toolsrc/src/vcpkg-test | |
| parent | d6285bc24b2e48da2f5e057fc759aff7c2b3b0af (diff) | |
| download | vcpkg-0bb8780a60e67320a966421e2923595fa57cbf22.tar.gz vcpkg-0bb8780a60e67320a966421e2923595fa57cbf22.zip | |
[vcpkg] Use std::filesystem when Visual Studio is greater than 2015 (#12774)
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'toolsrc/src/vcpkg-test')
| -rw-r--r-- | toolsrc/src/vcpkg-test/commands.build.cpp | 6 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg-test/files.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg-test/manifests.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/toolsrc/src/vcpkg-test/commands.build.cpp b/toolsrc/src/vcpkg-test/commands.build.cpp index 88749e7fe..76b205426 100644 --- a/toolsrc/src/vcpkg-test/commands.build.cpp +++ b/toolsrc/src/vcpkg-test/commands.build.cpp @@ -21,11 +21,11 @@ TEST_CASE ("build smoke test", "[commands-build]") VcpkgCmdArguments args = VcpkgCmdArguments::create_from_arg_sequence(std::begin(args_raw), std::end(args_raw)); args.binary_caching = false; args.buildtrees_root_dir = - std::make_unique<std::string>((Test::base_temporary_directory() / fs::u8path("buildtrees")).u8string()); + std::make_unique<std::string>(fs::u8string(Test::base_temporary_directory() / fs::u8path("buildtrees"))); args.install_root_dir = - std::make_unique<std::string>((Test::base_temporary_directory() / fs::u8path("installed")).u8string()); + std::make_unique<std::string>(fs::u8string(Test::base_temporary_directory() / fs::u8path("installed"))); args.packages_root_dir = - std::make_unique<std::string>((Test::base_temporary_directory() / fs::u8path("packages")).u8string()); + std::make_unique<std::string>(fs::u8string(Test::base_temporary_directory() / fs::u8path("packages"))); VcpkgPaths paths(fs_wrapper, args); if (fs_wrapper.exists(paths.buildtrees)) fs_wrapper.remove_all_inside(paths.buildtrees, VCPKG_LINE_INFO); if (fs_wrapper.exists(paths.packages)) fs_wrapper.remove_all_inside(paths.packages, VCPKG_LINE_INFO); diff --git a/toolsrc/src/vcpkg-test/files.cpp b/toolsrc/src/vcpkg-test/files.cpp index bc617d326..255c87d69 100644 --- a/toolsrc/src/vcpkg-test/files.cpp +++ b/toolsrc/src/vcpkg-test/files.cpp @@ -125,7 +125,7 @@ namespace { // regular symlink auto base_link = base; - base_link.replace_filename(base.filename().u8string() + "-orig"); + base_link.replace_filename(fs::u8string(base.filename()) + "-orig"); fs.write_contents(base_link, "", ec); CHECK_EC_ON_FILE(base_link, ec); vcpkg::Test::create_symlink(base_link, base, ec); diff --git a/toolsrc/src/vcpkg-test/manifests.cpp b/toolsrc/src/vcpkg-test/manifests.cpp index 95a0b149b..9a0ca94e2 100644 --- a/toolsrc/src/vcpkg-test/manifests.cpp +++ b/toolsrc/src/vcpkg-test/manifests.cpp @@ -264,7 +264,7 @@ TEST_CASE ("Serialize all the ports", "[manifests]") if (fs.exists(control)) { auto contents = fs.read_contents(control, VCPKG_LINE_INFO); - auto pghs = Paragraphs::parse_paragraphs(contents, control.u8string()); + auto pghs = Paragraphs::parse_paragraphs(contents, fs::u8string(control)); REQUIRE(pghs); scfs.push_back(std::move( |