Made test-builds.sh happy by adding missing stubs and adjusting existing ones.

diff --git a/src/Makefile.am b/src/Makefile.am
index 6cba03201ace0109ce439e17972c7dba0f3f89c8..25b1358de25ccccecffea5120a1e764847688611 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1220,6 +1220,7 @@ tests_testHttpReply_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
 tests_testACLMaxUserIP_SOURCES= \
        cbdata.cc \
        ClientInfo.h \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        DiskIO/ReadRequest.cc \
@@ -1282,6 +1283,7 @@ tests_testACLMaxUserIP_SOURCES= \
        swap_log_op.h \
        tests/stub_SwapDir.cc \
        SwapDir.h \
+       Transients.cc \
        log/access_log.h \
        tests/stub_access_log.cc \
        cache_cf.h \
@@ -1309,6 +1311,7 @@ tests_testACLMaxUserIP_SOURCES= \
        tests/stub_Port.cc \
        repl_modules.h \
        tests/stub_store.cc \
+       tests/stub_store_client.cc \
        store_rebuild.h \
        tests/stub_store_rebuild.cc \
        tests/stub_store_stats.cc \
@@ -1744,6 +1747,7 @@ tests_testDiskIO_SOURCES = \
        tests/stub_mime.cc \
        tests/stub_pconn.cc \
        tests/stub_Port.cc \
+       tests/stub_stat.cc \
        tests/stub_store_client.cc \
        tests/stub_store_stats.cc \
        store_rebuild.h \
@@ -2943,6 +2947,7 @@ tests_testStore_SOURCES= \
        mime.h \
        tests/stub_mime.cc \
        tests/stub_Port.cc \
+       tests/stub_stat.cc \
        tests/stub_store_client.cc \
        tests/stub_store_stats.cc \
        store_rebuild.h \
@@ -3080,6 +3085,7 @@ tests_testUfs_SOURCES = \
        internal.h \
        tests/stub_internal.cc \
        tests/stub_libformat.cc \
+       tests/stub_stat.cc \
        store_rebuild.h \
        tests/stub_store_rebuild.cc \
        tests/stub_store_stats.cc \
@@ -3313,6 +3319,7 @@ tests_testRock_SOURCES = \
        tests/stub_StatHist.cc \
        stmem.cc \
        repl_modules.h \
+       tests/stub_stat.cc \
        store.cc \
        StoreFileSystem.cc \
        StoreIOState.cc \

diff --git a/src/tests/stub_CollapsedForwarding.cc b/src/tests/stub_CollapsedForwarding.cc
new file mode 100644 (file)
index 0000000..717a759
--- /dev/null
+++ b/src/tests/stub_CollapsedForwarding.cc
@@ -0,0 +1,39 @@
+/*
+ * DEBUG: section 03    Configuration File Parsing
+ * AUTHOR: Robert Collins
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#include "squid.h"
+#include "CollapsedForwarding.h"
+
+#define STUB_API "CollapsedForwarding.cc"
+#include "tests/STUB.h"
+
+void CollapsedForwarding::Broadcast(StoreEntry const&) STUB

diff --git a/src/tests/stub_MemObject.cc b/src/tests/stub_MemObject.cc
index fb4a2f0e5f6e9d6e4997ff3125ed68d60558e65e..4ae520918d864241d62ea4ad5a6b504fa7d6fba0 100644 (file)
--- a/src/tests/stub_MemObject.cc
+++ b/src/tests/stub_MemObject.cc
@@ -43,6 +43,8 @@ HttpReply const * MemObject::getReply() const
     // XXX: required by testStore
     return NULL;
 }
+const char *MemObject::storeId() const STUB_RETVAL(NULL)
+const char *MemObject::logUri() const STUB_RETVAL(NULL)
 void MemObject::setUris(char const *aStoreId, char const *aLogUri, const HttpRequestMethod &aMethod) STUB
 void MemObject::reset() STUB
 void MemObject::delayRead(DeferredRead const &aRead) STUB

diff --git a/src/tests/stub_stat.cc b/src/tests/stub_stat.cc
index 6509b008df91c808a79279600231017489be86c5..5589860860a5260bc8d5841abc15e102fbe1b26d 100644 (file)
--- a/src/tests/stub_stat.cc
+++ b/src/tests/stub_stat.cc
@@ -32,3 +32,8 @@
 
 #include "squid.h"
 
+#define STUB_API "stat.cc"
+#include "tests/STUB.h"
+
+class StoreEntry;
+const char *storeEntryFlags(const StoreEntry *) STUB_RETVAL(NULL)

diff --git a/src/tests/stub_store.cc b/src/tests/stub_store.cc
index ccb13faacc39ee64ce57d56eb27c5af4914adc45..83b642e0c57cbcaee215cd1c83811db6df7ff333 100644 (file)
--- a/src/tests/stub_store.cc
+++ b/src/tests/stub_store.cc
@@ -42,7 +42,6 @@ void StoreEntry::expireNow() STUB
 void StoreEntry::releaseRequest() STUB
 void StoreEntry::negativeCache() STUB
 void StoreEntry::cacheNegatively() STUB
-void StoreEntry::invokeHandlers() STUB
 void StoreEntry::purgeMem() STUB
 void StoreEntry::swapOut() STUB
 void StoreEntry::swapOutFileClose(int how) STUB
@@ -116,12 +115,12 @@ std::ostream &operator <<(std::ostream &os, const StoreEntry &)
 }
 
 size_t storeEntryInUse() STUB_RETVAL(0)
-const char *storeEntryFlags(const StoreEntry *) STUB_RETVAL(NULL)
 void storeEntryReplaceObject(StoreEntry *, HttpReply *) STUB
 StoreEntry *storeGetPublic(const char *uri, const HttpRequestMethod& method) STUB_RETVAL(NULL)
 StoreEntry *storeGetPublicByRequest(HttpRequest * request) STUB_RETVAL(NULL)
 StoreEntry *storeGetPublicByRequestMethod(HttpRequest * request, const HttpRequestMethod& method) STUB_RETVAL(NULL)
 StoreEntry *storeCreateEntry(const char *, const char *, const RequestFlags &, const HttpRequestMethod&) STUB_RETVAL(NULL)
+StoreEntry *storeCreatePureEntry(const char *storeId, const char *logUrl, const RequestFlags &, const HttpRequestMethod&) STUB_RETVAL(NULL)
 void storeInit(void) STUB
 void storeConfigure(void) STUB
 void storeFreeMemory(void) STUB

diff --git a/src/tests/stub_store_client.cc b/src/tests/stub_store_client.cc
index f8c06c21efba32ba9bec03981c11ebf485fa4815..915e8c74b27eafaefc7812f1dda38021c25f84d9 100644 (file)
--- a/src/tests/stub_store_client.cc
+++ b/src/tests/stub_store_client.cc
@@ -25,7 +25,6 @@ storeLog(int tag, const StoreEntry * e)
 void storeLogOpen(void) STUB
 void storeDigestInit(void) STUB
 void storeRebuildStart(void) STUB
-const char *storeEntryFlags(const StoreEntry *) STUB_RETVAL(NULL)
 void storeReplSetup(void) STUB
 bool store_client::memReaderHasLowerOffset(int64_t anOffset) const STUB_RETVAL(false)
 void store_client::dumpStats(MemBuf * output, int clientNumber) const STUB