From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 20 Mar 2013 21:26:25 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v3.2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e82474e3fc97ddb14812d434d3cb5710719e510;p=thirdparty%2Fccache.git

Merge branch 'maint'

* maint:
  Fix test suite failure on GCC 4.8
  Comment spelling fix

Conflicts:
	test.sh
---

9e82474e3fc97ddb14812d434d3cb5710719e510
diff --cc test.sh
index 716721958,3e3838712..8c52b12d6
--- a/test.sh
+++ b/test.sh
@@@ -821,9 -680,7 +824,9 @@@ EO
      checkstat 'cache hit (direct)' 0
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile other.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile other.d "$expected_d_content"
 +    CCACHE_DISABLE=1 $COMPILER -c -Wp,-MD,other.d test.c -o reference_test.o
 +    compare_file reference_test.o test.o
  
      rm -f other.d
  
@@@ -831,8 -688,7 +834,8 @@@
      checkstat 'cache hit (direct)' 1
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile other.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile other.d "$expected_d_content"
 +    compare_file reference_test.o test.o
  
      rm -f other.d
  
@@@ -845,9 -701,7 +848,9 @@@
      checkstat 'cache hit (direct)' 0
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile other.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile other.d "$expected_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
  
@@@ -855,8 -709,7 +858,8 @@@
      checkstat 'cache hit (direct)' 1
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile other.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile other.d "$expected_d_content"
 +    compare_file reference_test.o test.o
  
      rm -f other.d
  
@@@ -882,9 -763,7 +885,9 @@@
      checkstat 'cache hit (direct)' 0
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile test.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile test.d "$expected_d_content"
 +    CCACHE_DISABLE=1 $COMPILER -c -MD test.c -o reference_test.o
 +    compare_file reference_test.o test.o
  
      rm -f test.d
  
@@@ -892,8 -771,7 +895,8 @@@
      checkstat 'cache hit (direct)' 1
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile test.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile test.d "$expected_d_content"
 +    compare_file reference_test.o test.o
  
      ##################################################################
      # Check the scenario of running a ccache with direct mode on a cache
@@@ -905,9 -783,7 +908,9 @@@
      checkstat 'cache hit (direct)' 0
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile test.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile test.d "$expected_d_content"
 +    CCACHE_DISABLE=1 $COMPILER -c -MD test.c -o reference_test.o
 +    compare_file reference_test.o test.o
  
      rm -f test.d
  
@@@ -915,8 -791,7 +918,8 @@@
      checkstat 'cache hit (direct)' 0
      checkstat 'cache hit (preprocessed)' 1
      checkstat 'cache miss' 1
-     checkfile test.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile test.d "$expected_d_content"
 +    compare_file reference_test.o test.o
  
      rm -f test.d
  
@@@ -924,8 -799,7 +927,8 @@@
      checkstat 'cache hit (direct)' 0
      checkstat 'cache hit (preprocessed)' 2
      checkstat 'cache miss' 1
-     checkfile test.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile test.d "$expected_d_content"
 +    compare_file reference_test.o test.o
  
      rm -f test.d
  
@@@ -933,8 -807,7 +936,8 @@@
      checkstat 'cache hit (direct)' 1
      checkstat 'cache hit (preprocessed)' 2
      checkstat 'cache miss' 1
-     checkfile test.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile test.d "$expected_d_content"
 +    compare_file reference_test.o test.o
  
      ##################################################################
      # Check that -MF works.
@@@ -945,9 -818,7 +948,9 @@@
      checkstat 'cache hit (direct)' 0
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile other.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile other.d "$expected_d_content"
 +    CCACHE_DISABLE=1 $COMPILER -c -MD -MF other.d test.c -o reference_test.o
 +    compare_file reference_test.o test.o
  
      rm -f other.d
  
@@@ -955,8 -826,7 +958,8 @@@
      checkstat 'cache hit (direct)' 1
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile other.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile other.d "$expected_d_content"
 +    compare_file reference_test.o test.o
  
      ##################################################################
      # Check that a missing .d file in the cache is handled correctly.
@@@ -968,16 -838,13 +971,16 @@@
      checkstat 'cache hit (direct)' 0
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile other.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile other.d "$expected_d_content"
 +    CCACHE_DISABLE=1 $COMPILER -c -MD test.c -o reference_test.o
 +    compare_file reference_test.o test.o
  
      $CCACHE $COMPILER -c -MD test.c
      checkstat 'cache hit (direct)' 1
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile other.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile other.d "$expected_d_content"
 +    compare_file reference_test.o test.o
  
      find $CCACHE_DIR -name '*.d' -exec rm -f '{}' \;
  
@@@ -985,8 -852,7 +988,8 @@@
      checkstat 'cache hit (direct)' 1
      checkstat 'cache hit (preprocessed)' 1
      checkstat 'cache miss' 1
-     checkfile other.d "test.o: test.c test1.h test3.h test2.h"
+     checkfile other.d "$expected_d_content"
 +    compare_file reference_test.o test.o
  
      ##################################################################
      # Check that stderr from both the preprocessor and the compiler is emitted