summaryrefslogtreecommitdiff
path: root/test/utils/archive/archive_usage.test.cpp
diff options
context:
space:
mode:
authorMaksim Denisov <denisov.maksim@huawei.com>2025-04-17 16:56:57 +0200
committerMaksim Denisov <denisov.maksim@huawei.com>2025-04-22 13:50:57 +0200
commit8b57548de9836fce3663b99d0140146f12668e8c (patch)
tree59c1f554ac15bb64fa7be2789bd810f42e616c61 /test/utils/archive/archive_usage.test.cpp
parentd65d711f844224dcf9215c52be8f69fd2885adfc (diff)
downloadjustbuild-8b57548de9836fce3663b99d0140146f12668e8c.tar.gz
FileSystemManager: Always remove directories recursively
Diffstat (limited to 'test/utils/archive/archive_usage.test.cpp')
-rw-r--r--test/utils/archive/archive_usage.test.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/test/utils/archive/archive_usage.test.cpp b/test/utils/archive/archive_usage.test.cpp
index 030cd223..ddf71353 100644
--- a/test/utils/archive/archive_usage.test.cpp
+++ b/test/utils/archive/archive_usage.test.cpp
@@ -339,8 +339,7 @@ TEST_CASE("Read-write archives", "[archive_read_write]") {
auto const& scenario = kTestScenarios[test_index];
// perform the test
- REQUIRE(FileSystemManager::RemoveDirectory(scenario.test_dir,
- /*recursively=*/true));
+ REQUIRE(FileSystemManager::RemoveDirectory(scenario.test_dir));
REQUIRE(FileSystemManager::CreateDirectory(scenario.test_dir));
auto anchor = FileSystemManager::ChangeDirectory(scenario.test_dir);
@@ -395,8 +394,7 @@ TEST_CASE("ArchiveOps", "[archive_ops]") {
std::optional<std::string> res{std::nullopt};
SECTION(std::string("Write ") + scenario.test_name) {
- REQUIRE(FileSystemManager::RemoveDirectory(scenario.test_dir,
- /*recursively=*/true));
+ REQUIRE(FileSystemManager::RemoveDirectory(scenario.test_dir));
REQUIRE(FileSystemManager::CreateDirectory(scenario.test_dir));
create_files(scenario.test_dir);
@@ -408,8 +406,7 @@ TEST_CASE("ArchiveOps", "[archive_ops]") {
}
SECTION(std::string("Extract ") + scenario.test_name + " to disk") {
- REQUIRE(FileSystemManager::RemoveDirectory(scenario.test_dir,
- /*recursively=*/true));
+ REQUIRE(FileSystemManager::RemoveDirectory(scenario.test_dir));
REQUIRE(FileSystemManager::CreateDirectory(scenario.test_dir));
res = ArchiveOps::ExtractArchive(
scenario.type, scenario.filename, ".");
@@ -430,9 +427,7 @@ TEST_CASE("ArchiveOps", "[archive_ops]") {
path = std::string{env_path} + ":" + path;
}
SECTION("Extract via system tools") {
- REQUIRE(
- FileSystemManager::RemoveDirectory(scenario.test_dir,
- /*recursively=*/true));
+ REQUIRE(FileSystemManager::RemoveDirectory(scenario.test_dir));
REQUIRE(FileSystemManager::CreateDirectory(scenario.test_dir));
REQUIRE(system(("export PATH=" + path + " && " + scenario.cmd +
" " + scenario.filename)