Only run the memcached tests when enabled

ccache · Jan 7, 2016 · ec3d0b4 · ec3d0b4
1 parent 8dbf369
commit ec3d0b4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -102,7 +102,7 @@ perf: ccache$(EXEEXT)
 .PHONY: test
 test: ccache$(EXEEXT) test/main$(EXEEXT)
 	test/main$(EXEEXT)
-	CC='$(CC)' $(srcdir)/test.sh
+	CC='$(CC)' @ccache_memcached@$(srcdir)/test.sh
 
 .PHONY: quicktest
 quicktest: test/main$(EXEEXT)

diff --git a/configure.ac b/configure.ac
@@ -19,6 +19,7 @@ esac
 AC_SUBST(extra_libs)
 AC_SUBST(include_dev_mk)
 AC_SUBST(test_suites)
+AC_SUBST(ccache_memcached)
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -104,6 +105,7 @@ if test x${enable_memcached} != x; then
     echo '  please install libmemcached>1.0 with development files'
     exit 1
     ])
+    ccache_memcached='CCACHE_MEMCACHED=1 '
 fi
 
 dnl Check for zlib

diff --git a/test.sh b/test.sh
@@ -2594,11 +2594,16 @@ cleanup
 pch
 upgrade
 prefix
-memcached
-memcached_only
-memcached_socket !win32
 "
 
+if [ ! -z $CCACHE_MEMCACHED ]; then
+    all_suites="$all_suites
+    memcached
+    memcached_only
+    memcached_socket !win32
+    "
+fi
+
 case $host_os in
     *MINGW*|*mingw*)
         export CCACHE_DETECT_SHEBANG