From 377a1c80e98951bb1c46b54c1f14400fba7f576f Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Wed, 12 Feb 2020 16:07:30 +0300 Subject: [PATCH] [libcxx] Don't assume cwd name in std::filesystem tests Summary: In `std::filesystem::proximate` tests we assume that the current working directory's name is `fs.op.proximate`. This is fine when we're running the tests locally. However, if we're running those tests on a remote machine via SSH, the directory layout may be different. For example, currently we copy each test executable individually into a temporary directory on the target board using SCP, so the assumption about the working directory name doesn't necessarily hold. This patch is the only thing that is necessary for all libc++ tests to pass when run remotely. Reviewers: ldionne, EricWF, mclow.lists Reviewed By: ldionne, EricWF Subscribers: christof, dexonsmith, libcxx-commits Tags: #libc Differential Revision: https://reviews.llvm.org/D74348 --- .../filesystems/fs.op.funcs/fs.op.proximate/proximate.pass.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.proximate/proximate.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.proximate/proximate.pass.cpp index a908d4c..8b54fa4 100644 --- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.proximate/proximate.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.proximate/proximate.pass.cpp @@ -71,7 +71,7 @@ TEST_CASE(basic_test) { {cwd, "a", ".."}, {parent_cwd, "a", "../.."}, {"a", cwd, "a"}, - {"a", parent_cwd, "fs.op.proximate/a"}, + {"a", parent_cwd, curdir / "a"}, {"/", "a", dot_dot_to_root / ".."}, {"/", "a/b", dot_dot_to_root / "../.."}, {"/", "a/b/", dot_dot_to_root / "../.."}, -- 2.7.4