From 3238b6d4de55f541c44caef379c66602bfded295 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Thu, 31 Oct 2024 17:06:43 -0500
Subject: [PATCH] fix

---
 cmake/versions.cmake      | 12 ++++++------
 support/test/src/test.cpp | 30 +++++++++---------------------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/cmake/versions.cmake b/cmake/versions.cmake
index aefb4bcb..fb10e730 100644
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -1,15 +1,15 @@
 set(BINUTILS_VERSION 2.41)
-set(BOOST_MAJOR_VERSION 1)
-set(BOOST_MINOR_VERSION 85)
-set(BOOST_PATCH_VERSION 0)
 set(BOOST2_MAJOR_VERSION 1)
 set(BOOST2_MINOR_VERSION 76)
 set(BOOST2_PATCH_VERSION 0)
+set(BOOST_MAJOR_VERSION 1)
+set(BOOST_MINOR_VERSION 85)
+set(BOOST_PATCH_VERSION 0)
 set(CPP_HTTPLIB_VERSION 0.16.3)
-set(CURL_VERSION 8.9.1)
 set(CURL2_VERSION 8_9_1)
-set(EXPAT_VERSION 2.6.2)
+set(CURL_VERSION 8.9.1)
 set(EXPAT2_VERSION 2_6_2)
+set(EXPAT_VERSION 2.6.2)
 set(GCC_VERSION 14.2.0)
 set(GTEST_VERSION 1.15.2)
 set(ICU_VERSION 75-1)
@@ -21,7 +21,7 @@ set(OPENSSL_VERSION 3.3.1)
 set(PKG_CONFIG_VERSION 0.29.2)
 set(PUGIXML_VERSION 1.14)
 set(SPDLOG_VERSION 1.14.1)
-set(SQLITE_VERSION 3460100)
 set(SQLITE2_VERSION 3.46.1)
+set(SQLITE_VERSION 3460100)
 set(STDUUID_VERSION 1.2.3)
 set(ZLIB_VERSION 1.3.1)
diff --git a/support/test/src/test.cpp b/support/test/src/test.cpp
index bf751bd6..a43b1398 100644
--- a/support/test/src/test.cpp
+++ b/support/test/src/test.cpp
@@ -29,33 +29,21 @@ static std::recursive_mutex file_mtx{};
 static std::vector<std::unique_ptr<repertory::utils::file::i_fs_item>>
     generated_files{};
 
-static void delete_generated_files() {
-  if (PROJECT_TEST_RESULT == 0) {
-    repertory::recur_mutex_lock lock{file_mtx};
-    std::map<std::string, bool> parent_paths;
-    for (auto &&path : generated_files) {
-      parent_paths[repertory::utils::path::get_parent_path(path->get_path())] =
-          true;
-    }
+struct file_deleter final {
+  std::string test_output_dir;
+
+  ~file_deleter() {
     generated_files.clear();
 
-    for (auto &&entry : parent_paths) {
-      EXPECT_TRUE(
-          repertory::utils::file::directory(entry.first).remove_recursively());
+    if (PROJECT_TEST_RESULT == 0) {
+      EXPECT_TRUE(repertory::utils::file::directory(test_output_dir)
+                      .remove_recursively());
     }
-
-    EXPECT_TRUE(repertory::utils::file::directory(
-                    repertory::test::get_test_output_dir())
-                    .remove_recursively());
   }
-}
-
-struct file_deleter final {
-  ~file_deleter() { delete_generated_files(); }
 };
 
-static auto deleter{
-    std::make_unique<file_deleter>(),
+const auto deleter{
+    std::make_unique<file_deleter>(repertory::test::get_test_output_dir()),
 };
 } // namespace