👷 gucc: improve test coverage for locale

CachyOS · Jul 5, 2024 · 4b35d00 · 4b35d00
1 parent f8fdeb2
commit 4b35d00
Show file tree

Hide file tree

Showing 6 changed files with 637 additions and 2 deletions.
diff --git a/gucc/include/gucc/locale.hpp b/gucc/include/gucc/locale.hpp
@@ -8,6 +8,10 @@ namespace gucc::locale {
 // Set system language
 auto set_locale(std::string_view locale, std::string_view mountpoint) noexcept -> bool;
 
+// Prepare system language.
+// Sets without updating system locale
+auto prepare_locale_set(std::string_view locale, std::string_view mountpoint) noexcept -> bool;
+
 }  // namespace gucc::locale
 
 #endif  // LOCALE_HPP
diff --git a/gucc/src/locale.cpp b/gucc/src/locale.cpp
@@ -12,7 +12,7 @@ using namespace std::string_view_literals;
 
 namespace gucc::locale {
 
-auto set_locale(std::string_view locale, std::string_view mountpoint) noexcept -> bool {
+auto prepare_locale_set(std::string_view locale, std::string_view mountpoint) noexcept -> bool {
     const auto& locale_config_path = fmt::format(FMT_COMPILE("{}/etc/locale.conf"), mountpoint);
     const auto& locale_gen_path    = fmt::format(FMT_COMPILE("{}/etc/locale.gen"), mountpoint);
 
@@ -40,13 +40,23 @@ LC_MESSAGES="{0}"
     // TODO(vnepogodin): refactor and make backups of locale config and locale gen
     utils::exec(fmt::format(FMT_COMPILE("sed -i \"s/#{0}/{0}/\" {1}"), locale, locale_gen_path));
 
+    // NOTE: maybe we should also write into /etc/default/locale if /etc/default exists and is a dir?
+    return true;
+}
+
+auto set_locale(std::string_view locale, std::string_view mountpoint) noexcept -> bool {
+    // Prepare locale
+    if (!locale::prepare_locale_set(locale, mountpoint)) {
+        spdlog::error("Failed to prepare locale files for '{}'", locale);
+        return false;
+    }
+
     // Generate locales
     if (!utils::arch_chroot_checked("locale-gen", mountpoint)) {
         spdlog::error("Failed to run locale-gen with locale '{}'", locale);
         return false;
     }
 
-    // NOTE: maybe we should also write into /etc/default/locale if /etc/default exists and is a dir?
     return true;
 }
 

diff --git a/gucc/tests/CMakeLists.txt b/gucc/tests/CMakeLists.txt
@@ -4,6 +4,8 @@
 
 file(GLOB files unit-*.cpp)
 
+set(GUCC_TEST_DIR "${CMAKE_CURRENT_SOURCE_DIR}/")
+
 foreach(file ${files})
     get_filename_component(file_basename ${file} NAME_WE)
     string(REGEX REPLACE "unit-([^$]+)" "test-\\1" testcase ${file_basename})
@@ -13,5 +15,6 @@ foreach(file ${files})
         $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-deprecated;-Wno-float-equal>
         $<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations>
     )
+    add_definitions(-DGUCC_TEST_DIR="${GUCC_TEST_DIR}")
     target_link_libraries(${testcase} PRIVATE project_warnings project_options gucc::gucc)
 endforeach()