Ignore locally installed ccache when running CCache unit tests (bz#1274031)

This commit is contained in:
Jitka Plesnikova 2015-10-22 12:05:20 +02:00
parent 8c1ba47dc7
commit 98cde138d4
2 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,15 @@
diff --git a/CCache/test.sh b/CCache/test.sh
index 6e5d267..a0e888d 100755
--- a/CCache/test.sh
+++ b/CCache/test.sh
@@ -15,6 +15,10 @@ else
SWIG=swig
fi
+# RH 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.$$

View File

@ -33,7 +33,7 @@
Summary: Connects C/C++/Objective C to some high-level programming languages
Name: swig
Version: 3.0.7
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv3+ and BSD
URL: http://swig.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
@ -44,6 +44,7 @@ Source1: description.h2m
Patch1: swig307-Fix-Ruby-trackings-code-to-use-C-hash.patch
Patch2: swig307-Ruby-trackings-patch-tidy-up.patch
Patch3: swig307-Ruby-trackings-support-for-1.8.patch
Patch4: swig-ccache-conflict-fix.patch
BuildRequires: perl, python2-devel, pcre-devel
BuildRequires: autoconf, automake, gawk, dos2unix
@ -109,6 +110,7 @@ This package contains documentation for SWIG and useful examples
%patch1 -p1 -b .rubyhash
%patch2 -p1 -b .rubytidyup
%patch3 -p1 -b .ruby18
%patch4 -p1 -b .ccache-conflict
for all in CHANGES README; do
iconv -f ISO88591 -t UTF8 < $all > $all.new
@ -206,6 +208,10 @@ ln -fs ../../bin/ccache-swig %{buildroot}%{_libdir}/ccache/swig
%doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT
%changelog
* Wed Oct 21 2015 David Sommerseth <davids@redhat.com> - 3.0.7-4
- Ignore locally installed ccache when running CCache unit tests
- Resolves: bz#1274031
* Fri Sep 18 2015 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.7-3
- Remove the old setools patch. The bug was already fixed by upstream
- Resolves: bz#1180257