diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2025-04-17 16:56:57 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2025-04-22 13:50:57 +0200 |
| commit | 8b57548de9836fce3663b99d0140146f12668e8c (patch) | |
| tree | 59c1f554ac15bb64fa7be2789bd810f42e616c61 /test/buildtool | |
| parent | d65d711f844224dcf9215c52be8f69fd2885adfc (diff) | |
| download | justbuild-8b57548de9836fce3663b99d0140146f12668e8c.tar.gz | |
FileSystemManager: Always remove directories recursively
Diffstat (limited to 'test/buildtool')
| -rw-r--r-- | test/buildtool/execution_engine/executor/executor_api.test.hpp | 8 | ||||
| -rw-r--r-- | test/buildtool/graph_traverser/graph_traverser_remote.test.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/buildtool/execution_engine/executor/executor_api.test.hpp b/test/buildtool/execution_engine/executor/executor_api.test.hpp index 2043da88..ff4c4999 100644 --- a/test/buildtool/execution_engine/executor/executor_api.test.hpp +++ b/test/buildtool/execution_engine/executor/executor_api.test.hpp @@ -479,7 +479,7 @@ static inline void TestUploadAndDownloadTrees( CHECK(FileSystemManager::IsNonUpwardsSymlink(tmpdir / "b")); CHECK(*FileSystemManager::ReadFile(tmpdir / "a") == "foo"); CHECK(*FileSystemManager::ReadSymlink(tmpdir / "b") == "bar"); - REQUIRE(FileSystemManager::RemoveDirectory(tmpdir, true)); + REQUIRE(FileSystemManager::RemoveDirectory(tmpdir)); } SECTION("Subdir in tree path") { @@ -496,7 +496,7 @@ static inline void TestUploadAndDownloadTrees( CHECK(FileSystemManager::IsNonUpwardsSymlink(tmpdir / "b" / "a")); CHECK(*FileSystemManager::ReadFile(tmpdir / "a") == "foo"); CHECK(*FileSystemManager::ReadSymlink(tmpdir / "b" / "a") == "bar"); - REQUIRE(FileSystemManager::RemoveDirectory(tmpdir, true)); + REQUIRE(FileSystemManager::RemoveDirectory(tmpdir)); } SECTION("Nested trees") { @@ -517,7 +517,7 @@ static inline void TestUploadAndDownloadTrees( CHECK(FileSystemManager::IsNonUpwardsSymlink(tmpdir / "b" / "a")); CHECK(*FileSystemManager::ReadFile(tmpdir / "a") == "foo"); CHECK(*FileSystemManager::ReadSymlink(tmpdir / "b" / "a") == "bar"); - REQUIRE(FileSystemManager::RemoveDirectory(tmpdir, true)); + REQUIRE(FileSystemManager::RemoveDirectory(tmpdir)); } SECTION("Dot-path tree as action input") { @@ -550,7 +550,7 @@ static inline void TestUploadAndDownloadTrees( CHECK(FileSystemManager::IsNonUpwardsSymlink(tmpdir / "b" / "a")); CHECK(*FileSystemManager::ReadFile(tmpdir / "a") == "foo"); CHECK(*FileSystemManager::ReadSymlink(tmpdir / "b" / "a") == "bar"); - REQUIRE(FileSystemManager::RemoveDirectory(tmpdir, true)); + REQUIRE(FileSystemManager::RemoveDirectory(tmpdir)); } SECTION("Dot-path non-tree as action input") { diff --git a/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp b/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp index f2b2d852..a611caab 100644 --- a/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp +++ b/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp @@ -35,7 +35,7 @@ [[nodiscard]] static auto CreateStorageConfig( RemoteExecutionConfig const& remote_config) -> StorageConfig { auto cache_dir = FileSystemManager::GetCurrentDirectory() / "cache"; - if (not FileSystemManager::RemoveDirectory(cache_dir, true) or + if (not FileSystemManager::RemoveDirectory(cache_dir) or not FileSystemManager::CreateDirectoryExclusive(cache_dir)) { Logger::Log(LogLevel::Error, "failed to create a test-local cache dir {}", |