Merge branch 'maint'

* maint:
  Fix bug testing with ecryptfs

diff --cc test.sh
index d0eaad12de8a814b2c23712a1723b4b950a7c307,afd73a40e8f7a3d075bb14be7d9f25c39de4f6fc..f7f9971fe22917e83a470d1a96c145b9fe779497
--- 1/test.sh
--- 2/test.sh
+++ b/test.sh
@@@ -573,10 -497,9 +573,10 @@@ base_suite() 
  
  link_suite() {
      if [ `dirname $COMPILER` = . ]; then
-         ln -s ../ccache $COMPILER
+         ln -s "$CCACHE" $COMPILER
          CCACHE_COMPILE="./$COMPILER"
          base_tests
 +        rm -f $COMPILER
      else
          echo "Compiler ($COMPILER) not taken from PATH -- not running link test"
      fi