diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/buildtool/file_system/TARGETS | 1 | ||||
| -rw-r--r-- | test/buildtool/file_system/git_tree.test.cpp | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/test/buildtool/file_system/TARGETS b/test/buildtool/file_system/TARGETS index 141deb42..5062ee29 100644 --- a/test/buildtool/file_system/TARGETS +++ b/test/buildtool/file_system/TARGETS @@ -52,7 +52,6 @@ , ["@", "src", "src/buildtool/file_system", "object_type"] , ["@", "src", "src/utils/cpp", "atomic"] , ["@", "src", "src/utils/cpp", "hex_string"] - , ["@", "src", "src/utils/cpp", "path"] , ["", "catch-main"] , ["utils", "container_matchers"] , ["utils", "shell_quoting"] diff --git a/test/buildtool/file_system/git_tree.test.cpp b/test/buildtool/file_system/git_tree.test.cpp index 18309834..1708ccee 100644 --- a/test/buildtool/file_system/git_tree.test.cpp +++ b/test/buildtool/file_system/git_tree.test.cpp @@ -38,7 +38,6 @@ #include "src/buildtool/file_system/object_type.hpp" #include "src/utils/cpp/atomic.hpp" #include "src/utils/cpp/hex_string.hpp" -#include "src/utils/cpp/path.hpp" #include "test/utils/container_matchers.hpp" #include "test/utils/shell_quoting.hpp" @@ -116,8 +115,11 @@ class SymlinksChecker final { std::vector<ArtifactDigest> const& ids) const noexcept -> bool { return std::all_of( ids.begin(), ids.end(), [&cas = cas_](ArtifactDigest const& id) { - auto content = cas.ReadObject(id.hash(), /*is_hex_id=*/true); - return content.has_value() and PathIsNonUpwards(*content); + return cas + .ReadObject(id.hash(), + /*is_hex_id=*/true, + /*as_valid_symlink=*/true) + .has_value(); }); }; |