From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 6 Nov 2008 08:33:01 +0000 (+1300)
Subject: Fix tests for DisKIO
X-Git-Tag: SQUID_3_2_0_1~1350
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=633c035d02960e30772140bab1083d9d38b68e25;p=thirdparty%2Fsquid.git

Fix tests for DisKIO
---

diff --git a/configure.in b/configure.in
index 602b26430b..16591d1d88 100755
--- a/configure.in
+++ b/configure.in
@@ -556,16 +556,20 @@ AC_ARG_ENABLE(disk-io,
 		DISK_MODULES="$DISK_MODULES $module"
 	    fi
 	done
+	AC_DEFINE(USE_DISKIO,1,[DiskIO modules are expected to be available.])
   	;;
   no)
+	AC_DEFINE(USE_DISKIO,0,[DiskIO modules are expected to be available.])
   	;;
   *)
 	DISK_MODULES="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
+	AC_DEFINE(USE_DISKIO,1,[DiskIO modules are expected to be available.])
 	;;
   esac
 ],
 [ if test -z "$DISK_MODULES"; then
     DISK_MODULES="Blocking"
+    AC_DEFINE(USE_DISKIO,1,[DiskIO modules are expected to be available.])
   fi
 ])
 if test -n "$DISK_MODULES"; then
diff --git a/src/Makefile.am b/src/Makefile.am
index b55d4daf0b..916e310e99 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1156,9 +1156,13 @@ check_PROGRAMS+= tests/testAuth \
 
 ## Special Universal .h dependency test script
 ## aborts if error encountered
-testHeaders: $(top_srcdir)/src/*.h $(top_srcdir)/src/DiskIO/*.h
+testHeaders: $(top_srcdir)/src/*.h $(top_srcdir)/src/DiskIO/*.h $(top_srcdir)/src/DiskIO/*/*.h
 	$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1
 	$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO" || exit 1
+	$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/AIO" || exit 1
+	$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/Blocking" || exit 1
+	$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/DiskDaemon" || exit 1
+	$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/DiskThreads" || exit 1
 ## src/repl/ has no .h files and its own makefile.
 
 ## No such file...
diff --git a/src/tests/testDiskIO.cc b/src/tests/testDiskIO.cc
index c997d36afd..64609a34c1 100644
--- a/src/tests/testDiskIO.cc
+++ b/src/tests/testDiskIO.cc
@@ -29,5 +29,9 @@ void
 testDiskIO::testFindDefault()
 {
     DiskIOModule * module = DiskIOModule::FindDefault();
+#if USE_DISKIO
     CPPUNIT_ASSERT(module != NULL);
+#else
+    CPPUNIT_ASSERT(module == NULL);
+#endif
 }