From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 24 Jun 2020 07:26:23 +0000 (+0200)
Subject: Fix color_diagnostics test failure if CCACHE_DIR is set in shell rc file
X-Git-Tag: v4.0~361
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c302a778f5a6623f130e4962561dbe690c0a538;p=thirdparty%2Fccache.git

Fix color_diagnostics test failure if CCACHE_DIR is set in shell rc file

If the user sets CCACHE_DIR in a shell startup file then that value will
override the one from the test suite, thus making changes in cache
statistics invisible which triggers failures.
---

diff --git a/test/suites/color_diagnostics.bash b/test/suites/color_diagnostics.bash
index 550990488..60254a186 100644
--- a/test/suites/color_diagnostics.bash
+++ b/test/suites/color_diagnostics.bash
@@ -66,7 +66,7 @@ color_diagnostics_generate_permutations() {
 }
 
 color_diagnostics_run_on_pty() {
-    script --return --quiet --command "unset GCC_COLORS; ${1:?}" /dev/null </dev/null
+    script --return --quiet --command "unset GCC_COLORS; CCACHE_DIR='$CCACHE_DIR' ${1:?}" /dev/null </dev/null
 }
 
 color_diagnostics_test() {