Fix tests for DisKIO

diff --git a/configure.in b/configure.in
index 602b26430bba399351dd36a603ed9e57d118ebcc..16591d1d881502f8addcce66087f2fb58b6a7b53 100755 (executable)
--- 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 b55d4daf0b14ac62ba8978c35cb95af74ad559a0..916e310e99a0f5b821976f5905d04746de331fa5 100644 (file)
--- 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 c997d36afd755a95c3175e72c972949dee159554..64609a34c1a7ab41faa1e6b43a2b95fb920d6ddc 100644 (file)
--- 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
 }