SourceMaintenance updates

diff --git a/src/tests/Stub.list b/src/tests/Stub.list
index 72413414f776312dd8c530e8f641eac36609d99e..0b4aab97954d1da64b4660ec37633932e0a8d25b 100644 (file)
--- a/src/tests/Stub.list
+++ b/src/tests/Stub.list
@@ -22,7 +22,6 @@ STUB_SOURCE= tests/STUB.h \
        tests/stub_CommIO.cc \
        tests/stub_debug.cc \
        tests/stub_DelayId.cc \
-       tests/stub_DiskIOModule.cc \
        tests/stub_errorpage.cc \
        tests/stub_ETag.cc \
        tests/stub_event.cc \
@@ -44,6 +43,7 @@ STUB_SOURCE= tests/STUB.h \
        tests/stub_libauth_acls.cc \
        tests/stub_libauth.cc \
        tests/stub_libcomm.cc \
+       tests/stub_libdiskio.cc \
        tests/stub_libeui.cc \
        tests/stub_libformat.cc \
        tests/stub_libicmp.cc \

diff --git a/src/tests/stub_DiskIOModule.cc b/src/tests/stub_DiskIOModule.cc
deleted file mode 100644 (file)
index 4787fc9..0000000
--- a/src/tests/stub_DiskIOModule.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
- *
- * Squid software is distributed under GPLv2+ license and includes
- * contributions from numerous individuals and organizations.
- * Please see the COPYING and CONTRIBUTORS files for details.
- */
-
-#include "squid.h"
-
-#define STUB_API "DiskIOModule.cc"
-#include "tests/STUB.h"
-
-#include "DiskIO/DiskIOModule.h"
-
-#include <vector>
-
-void DiskIOModule::SetupAllModules() STUB
-void DiskIOModule::ModuleAdd(DiskIOModule &) STUB
-void DiskIOModule::FreeAllModules() STUB
-DiskIOModule *DiskIOModule::Find(char const *) STUB_RETVAL(NULL)
-DiskIOModule *DiskIOModule::FindDefault() STUB_RETVAL(NULL)
-std::vector<DiskIOModule*> const &DiskIOModule::Modules() STUB_RETSTATREF(std::vector<DiskIOModule*>)
-

diff --git a/src/tests/stub_libdiskio.cc b/src/tests/stub_libdiskio.cc
index b902cf2e6304a4f05bf7f180d1c1218fc1880411..1846e68f8c2b7e2cbc46f9e34afd18826201b85a 100644 (file)
--- a/src/tests/stub_libdiskio.cc
+++ b/src/tests/stub_libdiskio.cc
@@ -33,3 +33,4 @@ ReadRequest::ReadRequest(char *, off_t, size_t) {STUB}
 
 #include "DiskIO/WriteRequest.h"
 WriteRequest::WriteRequest(char const *, off_t, size_t, FREE *) {STUB}
+