fix env variable settings and add swig tests

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10935 626c5289-ae23-0410-ae9c-e8d60b6d4f22

CCache/Makefile.in

@@ -11,6 +11,8 @@ PACKAGE_NAME=@PACKAGE_NAME@
 
 CC=@CC@
 CFLAGS=@CFLAGS@ -I.
+SWIG=swig
+SWIG_LIB=../../Lib
 EXEEXT=@EXEEXT@
 
 LIBS= @LIBS@
@@ -41,8 +43,10 @@ install: $(PACKAGE_NAME)$(EXEEXT) $(PACKAGE_NAME).1
 clean:
 	/bin/rm -f $(OBJS) *~ $(PACKAGE_NAME)$(EXEEXT)
 
+check : test
+
 test: test.sh
-	CC='$(CC)' ./test.sh
+	SWIG_LIB='$(SWIG_LIB)' PATH=../..:$$PATH SWIG='$(SWIG)' CC='$(CC)' ./test.sh
 
 check: test
 

CCache/test.sh

@@ -394,7 +394,6 @@ CCACHE_COMPILE="$CCACHE $SWIG"
 swigtests
 
 testsuite="link"
-echo ln -s $CCACHE $COMPILER
 ln -s $CCACHE $COMPILER
 CCACHE_COMPILE="./$COMPILER"
 basetests
@@ -405,24 +404,24 @@ swigtests
 rm "./$SWIG"
 
 testsuite="hardlink"
-CCACHE_COMPILE="$CCACHE $COMPILER"
-CCACHE_NOCOMPRESS=1 CCACHE_HARDLINK=1 basetests
-CCACHE_COMPILE="$CCACHE $SWIG"
-CCACHE_NOCOMPRESS=1 CCACHE_HARDLINK=1 swigtests
+CCACHE_COMPILE="env CCACHE_NOCOMPRESS=1 CCACHE_HARDLINK=1 $CCACHE $COMPILER"
+basetests
+CCACHE_COMPILE="env CCACHE_NOCOMPRESS=1 CCACHE_HARDLINK=1 $CCACHE $SWIG"
+swigtests
 
 testsuite="cpp2"
-CCACHE_COMPILE="$CCACHE $COMPILER"
-CCACHE_CPP2=1 basetests
-CCACHE_COMPILE="$CCACHE $SWIG"
-CCACHE_CPP2=1 swigtests
+CCACHE_COMPILE="env CCACHE_CPP2=1 $CCACHE $COMPILER"
+basetests
+CCACHE_COMPILE="env CCACHE_CPP2=1 $CCACHE $SWIG"
+swigtests
 
 testsuite="nlevels4"
-CCACHE_COMPILE="$CCACHE $COMPILER"
-CCACHE_NLEVELS=4 basetests
+CCACHE_COMPILE="env CCACHE_NLEVELS=4 $CCACHE $COMPILER"
+basetests
 
 testsuite="nlevels1"
-CCACHE_COMPILE="$CCACHE $COMPILER"
-CCACHE_NLEVELS=1 basetests
+CCACHE_COMPILE="env CCACHE_NLEVELS=1 $CCACHE $COMPILER"
+basetests
 
 cd ..
 rm -rf $TESTDIR