From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 31 Mar 2013 18:24:56 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v3.2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43d9550fcd2f9a2840a90788205627233e752995;p=thirdparty%2Fccache.git

Merge branch 'maint'

* maint:
  Fix test suite failure on GCC 4.8, take two

Conflicts:
	test.sh
---

43d9550fcd2f9a2840a90788205627233e752995
diff --cc test.sh
index 8c52b12d6,18bea944d..e74792da0
--- a/test.sh
+++ b/test.sh
@@@ -848,9 -704,7 +851,9 @@@ EO
      checkstat 'cache hit (direct)' 0
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile other.d "$expected_d_content"
+     checkfile other.d "$expected_mmd_d_content"
 +    CCACHE_DISABLE=1 $COMPILER -c -Wp,-MMD,other.d test.c -o reference_test.o
 +    compare_file reference_test.o test.o
  
      rm -f other.d
  
@@@ -858,8 -712,7 +861,8 @@@
      checkstat 'cache hit (direct)' 1
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile other.d "$expected_d_content"
+     checkfile other.d "$expected_mmd_d_content"
 +    compare_file reference_test.o test.o
  
      rm -f other.d