From 4a2f38da0ecb9797ded7757341be18959880ddcd Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Sat, 12 Oct 2024 19:38:47 +0200 Subject: [PATCH] test: simplify path handling --- test/tools_test.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/tools_test.cpp b/test/tools_test.cpp index 28ed86312..173eefb06 100644 --- a/test/tools_test.cpp +++ b/test/tools_test.cpp @@ -812,7 +812,7 @@ TEST_P(tools_test, end_to_end) { std::chrono::seconds const timeout{5}; #endif dwarfs::temporary_directory tempdir("dwarfs"); - auto td = fs::path(tempdir.path().string()); + auto td = tempdir.path(); auto image = td / "test.dwarfs"; auto image_hdr = td / "test_hdr.dwarfs"; auto fsdata_dir = td / "fsdata"; @@ -1236,7 +1236,7 @@ TEST_P(tools_test, mutating_and_error_ops) { std::chrono::seconds const timeout{5}; #endif dwarfs::temporary_directory tempdir("dwarfs"); - auto td = fs::path(tempdir.path().string()); + auto td = tempdir.path(); auto mountpoint = td / "mnt"; auto file = mountpoint / "bench.sh"; auto empty_dir = mountpoint / "empty"; @@ -1445,7 +1445,7 @@ TEST_P(tools_test, categorize) { std::chrono::seconds const timeout{5}; dwarfs::temporary_directory tempdir("dwarfs"); - auto td = fs::path(tempdir.path().string()); + auto td = tempdir.path(); auto image = td / "test.dwarfs"; auto image_recompressed = td / "test2.dwarfs"; auto fsdata_dir = td / "fsdata"; @@ -1703,7 +1703,7 @@ INSTANTIATE_TEST_SUITE_P( TEST(tools_test, dwarfsextract_progress) { dwarfs::temporary_directory tempdir("dwarfs"); - auto td = fs::path(tempdir.path().string()); + auto td = tempdir.path(); auto tarfile = td / "output.tar"; auto out = @@ -1723,7 +1723,7 @@ TEST(tools_test, dwarfsextract_progress) { TEST(tools_test, dwarfsextract_stdout) { dwarfs::temporary_directory tempdir("dwarfs"); - auto td = fs::path(tempdir.path().string()); + auto td = tempdir.path(); auto out = subprocess::check_run(dwarfsextract_bin, "-i", test_catdata_dwarfs, "-f", "mtree"); @@ -1736,7 +1736,7 @@ TEST(tools_test, dwarfsextract_stdout) { TEST(tools_test, dwarfsextract_file_out) { dwarfs::temporary_directory tempdir("dwarfs"); - auto td = fs::path(tempdir.path().string()); + auto td = tempdir.path(); auto outfile = td / "output.mtree"; auto out = subprocess::check_run(dwarfsextract_bin, "-i", test_catdata_dwarfs,