From bf781e2a97178d5393f095ab3b4935e6befde3aa Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 23 Feb 2020 21:37:41 +0100
Subject: [PATCH] Remove leftover debug settings in test suites

---
 test/suites/basedir.bash   | 11 +++++------
 test/suites/fileclone.bash |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/test/suites/basedir.bash b/test/suites/basedir.bash
index d8513b363..ff4a99591 100644
--- a/test/suites/basedir.bash
+++ b/test/suites/basedir.bash
@@ -49,8 +49,7 @@ if ! $HOST_OS_WINDOWS && ! $HOST_OS_CYGWIN; then
     TEST "Path normalization"
 
     cd dir1
-    CCACHE_DEBUG=1 CCACHE_BASEDIR="`pwd`" $CCACHE_COMPILE -I$(pwd)/include -c src/test.c
-    mv test.o*text first.text
+    CCACHE_BASEDIR="`pwd`" $CCACHE_COMPILE -I$(pwd)/include -c src/test.c
     expect_stat 'cache hit (direct)' 0
     expect_stat 'cache hit (preprocessed)' 0
     expect_stat 'cache miss' 1
@@ -59,7 +58,7 @@ if ! $HOST_OS_WINDOWS && ! $HOST_OS_CYGWIN; then
 
     # Rewriting triggered by CCACHE_BASEDIR should handle paths with multiple
     # slashes, redundant "/." parts and "foo/.." parts correctly.
-    CCACHE_DEBUG=1 CCACHE_BASEDIR=$(pwd) $CCACHE_COMPILE -I$(pwd)//./subdir/../include -c $(pwd)/src/test.c
+    CCACHE_BASEDIR=$(pwd) $CCACHE_COMPILE -I$(pwd)//./subdir/../include -c $(pwd)/src/test.c
     expect_stat 'cache hit (direct)' 1
     expect_stat 'cache hit (preprocessed)' 0
     expect_stat 'cache miss' 1
@@ -134,18 +133,18 @@ if ! $HOST_OS_WINDOWS && ! $HOST_OS_CYGWIN; then
     # dir2/src/build -> /absolute/path/to/build2
 
     cd dir1/src
-    CCACHE_DEBUG=1 CCACHE_BASEDIR=/ $CCACHE_COMPILE -I$(pwd)/../include -c $(pwd)/test.c -o $(pwd)/build/test.o
+    CCACHE_BASEDIR=/ $CCACHE_COMPILE -I$(pwd)/../include -c $(pwd)/test.c -o $(pwd)/build/test.o
     expect_stat 'cache hit (direct)' 0
     expect_stat 'cache miss' 1
 
     cd ../../dir2/src
     # Apparent CWD:
-    CCACHE_DEBUG=1 CCACHE_BASEDIR=/ $CCACHE_COMPILE -I$(pwd)/../include -c $(pwd)/test.c -o $(pwd)/build/test.o
+    CCACHE_BASEDIR=/ $CCACHE_COMPILE -I$(pwd)/../include -c $(pwd)/test.c -o $(pwd)/build/test.o
     expect_stat 'cache hit (direct)' 1
     expect_stat 'cache miss' 1
 
     # Actual CWD (e.g. from $(CURDIR) in a Makefile):
-    CCACHE_DEBUG=1 CCACHE_BASEDIR=/ $CCACHE_COMPILE -I$(pwd -P)/../include -c $(pwd -P)/test.c -o $(pwd -P)/build/test.o
+    CCACHE_BASEDIR=/ $CCACHE_COMPILE -I$(pwd -P)/../include -c $(pwd -P)/test.c -o $(pwd -P)/build/test.o
     expect_stat 'cache hit (direct)' 2
     expect_stat 'cache miss' 1
 fi
diff --git a/test/suites/fileclone.bash b/test/suites/fileclone.bash
index c101c209a..b035c1dfc 100644
--- a/test/suites/fileclone.bash
+++ b/test/suites/fileclone.bash
@@ -13,13 +13,13 @@ SUITE_fileclone() {
 
     $REAL_COMPILER -c -o reference_test.o test.c
 
-    CCACHE_FILECLONE=1 CCACHE_DEBUG=1 $CCACHE_COMPILE -c test.c
+    CCACHE_FILECLONE=1 $CCACHE_COMPILE -c test.c
     expect_stat 'cache hit (preprocessed)' 0
     expect_stat 'cache miss' 1
     expect_stat 'files in cache' 2
     expect_equal_object_files reference_test.o test.o
 
-    CCACHE_FILECLONE=1 CCACHE_DEBUG=1  $CCACHE_COMPILE -c test.c
+    CCACHE_FILECLONE=1 $CCACHE_COMPILE -c test.c
     expect_stat 'cache hit (preprocessed)' 1
     expect_stat 'cache miss' 1
     expect_stat 'files in cache' 2
@@ -44,7 +44,7 @@ SUITE_fileclone() {
     expect_stat 'files in cache' 1
     expect_equal_object_files reference_test.o test.o
 
-    CCACHE_FILECLONE=1 CCACHE_DEBUG=1  $CCACHE_COMPILE -c test.c
+    CCACHE_FILECLONE=1 $CCACHE_COMPILE -c test.c
     expect_stat 'cache hit (preprocessed)' 1
     expect_stat 'cache miss' 1
     expect_stat 'files in cache' 1
-- 
2.47.2