From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 13 Dec 2009 14:11:17 +0000 (+0100)
Subject: Implement installcheck make target
X-Git-Tag: v3.0pre0~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24f886c412d01b6530ccfd2457faa82a16dffcc0;p=thirdparty%2Fccache.git

Implement installcheck make target
---

diff --git a/Makefile.in b/Makefile.in
index fd06a6137..03d569da6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -87,11 +87,8 @@ check: test
 distclean: clean
 	rm -f Makefile config.h config.log config.status
 
-# FIXME: To fix this, test.sh needs to be able to take ccache from the
-# installed prefix, not from the source dir.
 installcheck:
-	@echo "WARNING!  This is not really \"installcheck\" yet."
-	$(MAKE) check
+	CCACHE=$(bindir)/ccache ./test.sh
 
 check-syntax:
 	$(CC) $(filter-out -M%, $(CPPFLAGS)) $(CFLAGS) -S -o /dev/null $(CHK_SOURCES)
diff --git a/NEWS b/NEWS
index 4ef9b6448..1f2bdf143 100644
--- a/NEWS
+++ b/NEWS
@@ -48,6 +48,8 @@ New features and improvements:
   - Standard error output from the compiler is now only stored in the cache if
     it's non-empty.
 
+  - Added installcheck make target.
+
 Bug fixes:
 
   - Fixed build on FreeBSD.
diff --git a/ccache.h b/ccache.h
index 20f5ad327..a111c18fa 100644
--- a/ccache.h
+++ b/ccache.h
@@ -1,7 +1,7 @@
 #ifndef CCACHE_H
 #define CCACHE_H
 
-#define CCACHE_VERSION "2.4+jrosdahl"
+#define CCACHE_VERSION "2.4+direct.1"
 
 #include "config.h"
 
diff --git a/test.sh b/test.sh
index da9ff3798..bfa9acc4f 100755
--- a/test.sh
+++ b/test.sh
@@ -9,7 +9,9 @@ else
     COMPILER=cc
 fi
 
-CCACHE=$PWD/ccache
+if [ -z "$CCACHE" ]; then
+    CCACHE=$PWD/ccache
+fi
 TESTDIR=testdir.$$
 
 unset CCACHE_DISABLE