From: cupu <cupu@users.noreply.github.com>
Date: Sun, 2 Jul 2023 08:34:13 +0000 (+0200)
Subject: feat: Expand environment variables in debug_dir configuration (#1307)
X-Git-Tag: v4.9~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83da2971362d5cf9212d44d1d39d533ae8e30f77;p=thirdparty%2Fccache.git

feat: Expand environment variables in debug_dir configuration (#1307)
---

diff --git a/src/Config.cpp b/src/Config.cpp
index 982134e1d..7fea4a62d 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -981,7 +981,7 @@ Config::set_item(const std::string& key,
     break;
 
   case ConfigItem::debug_dir:
-    m_debug_dir = value;
+    m_debug_dir = Util::expand_environment_variables(value);
     break;
 
   case ConfigItem::depend_mode:
diff --git a/unittest/test_Config.cpp b/unittest/test_Config.cpp
index 4a0b7b411..6b97e4e7e 100644
--- a/unittest/test_Config.cpp
+++ b/unittest/test_Config.cpp
@@ -109,6 +109,7 @@ TEST_CASE("Config::update_from_file")
     "compression=false\n"
     "compression_level= 2\n"
     "cpp_extension = .foo\n"
+    "debug_dir = $USER$/${USER}/.ccache_debug\n"
     "depend_mode = true\n"
     "direct_mode = false\n"
     "disable = true\n"
@@ -150,6 +151,7 @@ TEST_CASE("Config::update_from_file")
   CHECK_FALSE(config.compression());
   CHECK(config.compression_level() == 2);
   CHECK(config.cpp_extension() == ".foo");
+  CHECK(config.debug_dir() == FMT("{0}$/{0}/.ccache_debug", user));
   CHECK(config.depend_mode());
   CHECK_FALSE(config.direct_mode());
   CHECK(config.disable());