From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 13 Dec 2014 13:10:36 +0000 (+0100)
Subject: Merge branch '3.1-maint' into 3.2-maint
X-Git-Tag: v3.2.2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9bed1e1c59dfae6c7c056f29dad0b4a04df418b;p=thirdparty%2Fccache.git

Merge branch '3.1-maint' into 3.2-maint

* 3.1-maint:
  Spelling fix
---

b9bed1e1c59dfae6c7c056f29dad0b4a04df418b
diff --cc test.sh
index b511146c7,d0cc531f3..e473857de
--- a/test.sh
+++ b/test.sh
@@@ -236,13 -217,10 +236,13 @@@ base_tests() 
  
      testname="CCACHE_DISABLE"
      mv $CCACHE_DIR $CCACHE_DIR.saved
 +    saved_config_path=$CCACHE_CONFIGPATH
 +    unset CCACHE_CONFIGPATH
      CCACHE_DISABLE=1 $CCACHE_COMPILE -c test1.c 2> /dev/null
      if [ -d $CCACHE_DIR ]; then
-         test_failed "$CCACHE_DIR created dispite CCACHE_DISABLE being set"
+         test_failed "$CCACHE_DIR created despite CCACHE_DISABLE being set"
      fi
 +    CCACHE_CONFIGPATH=$saved_config_path
      mv $CCACHE_DIR.saved $CCACHE_DIR
      checkstat 'cache hit (preprocessed)' 3
      $CCACHE_COMPILE -c test1.c