Allow execution of make check when not all the FS store are selected during

configure.

diff --git a/configure.in b/configure.in
index d01761cd6acf7efa88fcef2d55e9ec6c741364d0..64f03232a801bfc0aea80e1be10f8592c7b48013 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.404 2006/04/22 08:23:14 robertc Exp $
+dnl  $Id: configure.in,v 1.405 2006/04/23 09:18:30 serassio Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE([tar-ustar])
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.404 $)dnl
+AC_REVISION($Revision: 1.405 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -482,6 +482,7 @@ NEED_BLOCKING=
 NEED_DISKDAEMON=
 NEED_DISKTHREADS=
 NEED_AIO=
+STORE_TESTS=
 for fs in $STORE_MODULES none; do
     case "$fs" in
     diskd)
@@ -495,10 +496,15 @@ for fs in $STORE_MODULES none; do
        NEED_DISKTHREADS="true"
        ;;
     coss)
-       NEED_AIO="true"
+       NEED_AIO="true"
+       STORE_TESTS="$STORE_TESTS tests/testCoss$EXEEXT"
+       ;;
+    null)
+       STORE_TESTS="$STORE_TESTS tests/testNull$EXEEXT"
        ;;
     ufs)
-        UFS_FOUND="true"
+       UFS_FOUND="true"
+       STORE_TESTS="$STORE_TESTS tests/testUfs$EXEEXT"
     esac
 done
 STORE_OBJS=
@@ -521,11 +527,13 @@ if test -z "$UFS_FOUND" && test -n "$NEED_UFS"; then
    STORE_LIBS="$STORE_LIBS libufs.a"
    STORE_MODULES="$STORE_MODULES ufs"
    STORE_LINKOBJS="$STORE_LINKOBJS fs/ufs/StoreFSufs.o"
+   STORE_TESTS="$STORE_TESTS tests/testUfs$EXEEXT"
 fi
   
 AC_SUBST(STORE_OBJS)
 AC_SUBST(STORE_LIBS)
 AC_SUBST(STORE_LINKOBJS)
+AC_SUBST(STORE_TESTS)
 
 AC_ARG_ENABLE(disk-io,
 [  --enable-disk-io=\"list of modules\"

diff --git a/src/Makefile.am b/src/Makefile.am
index 85dacc6efe562f27b73fa3be7fc247780890de28..fddd90642e5e61796a3104a202b91834f1d7882d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.132 2006/04/22 05:29:18 robertc Exp $
+#  $Id: Makefile.am,v 1.133 2006/04/23 09:18:30 serassio Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -183,7 +183,10 @@ EXTRA_PROGRAMS = \
        pinger \
        dnsserver \
        recv-announce \
-       ufsdump 
+       ufsdump \
+       tests/testUfs \
+       tests/testCoss \
+       tests/testNull
 
 noinst_PROGRAMS = \
        cf_gen
@@ -997,11 +1000,9 @@ TESTSOURCES= \
 check_PROGRAMS+= \
        tests/testAuth \
        tests/testBoilerplate \
-       tests/testCoss \
        tests/testHeaders \
-       tests/testNull \
        tests/testStore \
-       tests/testUfs
+       @STORE_TESTS@
 
 tests_testAuth_SOURCES= tests/testAuth.cc tests/testMain.cc  tests/testAuth.h $(TESTSOURCES) \
        AuthScheme.cc authenticate.cc AuthUser.cc AuthUserRequest.cc AuthConfig.cc \