From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 28 Aug 2020 15:02:25 +0000 (+0200)
Subject: Reset environment variables before running test suite probe
X-Git-Tag: v4.0~156
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86cb81c3bd916351de616d0debe2c5fa7473f6d6;p=thirdparty%2Fccache.git

Reset environment variables before running test suite probe

This makes it possible to use $CCACHE in a stable way in probe
functions.
---

diff --git a/test/run b/test/run
index 692f755d9..4cd1578a5 100755
--- a/test/run
+++ b/test/run
@@ -281,6 +281,29 @@ expect_perm() {
     fi
 }
 
+reset_environment() {
+    while read name; do
+        unset $name
+    done <<EOF
+$(env | sed -n 's/^\(CCACHE_[A-Z0-9_]*\)=.*$/\1/p')
+EOF
+    unset GCC_COLORS
+    unset TERM
+    unset XDG_CACHE_HOME
+    unset XDG_CONFIG_HOME
+
+    export CCACHE_DETECT_SHEBANG=1
+    export CCACHE_DIR=$ABS_TESTDIR/.ccache
+    export CCACHE_CONFIGPATH=$CCACHE_DIR/ccache.conf # skip secondary config
+    export CCACHE_LOGFILE=$ABS_TESTDIR/ccache.log
+    export CCACHE_NODIRECT=1
+
+    # Many tests backdate files, which updates their ctimes. In those tests, we
+    # must ignore ctimes. Might as well do so everywhere.
+    DEFAULT_SLOPPINESS=include_file_ctime
+    export CCACHE_SLOPPINESS="$DEFAULT_SLOPPINESS"
+}
+
 run_suite() {
     local suite_name=$1
 
@@ -289,6 +312,8 @@ run_suite() {
     cd $ABS_TESTDIR
     rm -rf $ABS_TESTDIR/fixture
 
+    reset_environment
+
     if type SUITE_${suite_name}_PROBE >/dev/null 2>&1; then
         mkdir $ABS_TESTDIR/probe
         cd $ABS_TESTDIR/probe
@@ -313,30 +338,10 @@ run_suite() {
 
 TEST() {
     CURRENT_TEST=$1
-
-    while read name; do
-        unset $name
-    done <<EOF
-$(env | sed -n 's/^\(CCACHE_[A-Z0-9_]*\)=.*$/\1/p')
-EOF
-    unset GCC_COLORS
-    unset TERM
-    unset XDG_CACHE_HOME
-    unset XDG_CONFIG_HOME
-
-    export CCACHE_DETECT_SHEBANG=1
-    export CCACHE_DIR=$ABS_TESTDIR/.ccache
-    export CCACHE_CONFIGPATH=$CCACHE_DIR/ccache.conf # skip secondary config
-    export CCACHE_LOGFILE=$ABS_TESTDIR/ccache.log
-    export CCACHE_NODIRECT=1
-
-    # Many tests backdate files, which updates their ctimes. In those tests, we
-    # must ignore ctimes. Might as well do so everywhere.
-    DEFAULT_SLOPPINESS=include_file_ctime
-    export CCACHE_SLOPPINESS="$DEFAULT_SLOPPINESS"
-
     CCACHE_COMPILE="$CCACHE $COMPILER"
 
+    reset_environment
+
     if $verbose; then
         printf "\n  %s" "$CURRENT_TEST"
     else