From 790c72944746ddcd6948daca89ecb4f758ac4493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <me@besser82.io>
Date: Sun, 6 Dec 2015 14:00:54 +0100
Subject: [PATCH 1/2] Ignore locally installed ccache when running CCache unit
 tests original patch by David Sommerseth <davids@redhat.com>

---
 CCache/test.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CCache/test.sh b/CCache/test.sh
index 6e5d26703..d8640ccaa 100755
--- a/CCache/test.sh
+++ b/CCache/test.sh
@@ -15,6 +15,12 @@ else
  SWIG=swig
 fi
 
+# fix: Remove ccache from $PATH if it exists
+#      as it will influence the unit tests
+PATH="`echo $PATH | \
+ awk -v RS=: -v ORS=: '/\/usr\/lib(64|)\/ccache(:|)/ {next} {print}' | \
+ sed 's/:*$//'`"
+
 CCACHE=../ccache-swig
 TESTDIR=test.$$
 

From 1a977a21922cb418de42c568aee418df3582f842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <me@besser82.io>
Date: Wed, 16 Dec 2015 11:01:59 +0100
Subject: [PATCH 2/2] use sed only to filter CCache from $PATH

---
 CCache/test.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CCache/test.sh b/CCache/test.sh
index d8640ccaa..438e782cd 100755
--- a/CCache/test.sh
+++ b/CCache/test.sh
@@ -18,8 +18,7 @@ fi
 # fix: Remove ccache from $PATH if it exists
 #      as it will influence the unit tests
 PATH="`echo $PATH | \
- awk -v RS=: -v ORS=: '/\/usr\/lib(64|)\/ccache(:|)/ {next} {print}' | \
- sed 's/:*$//'`"
+ sed -e 's!:/usr\(/local\)*/lib\([0-9]\)*/ccache\(/\)*!!g'`"
 
 CCACHE=../ccache-swig
 TESTDIR=test.$$