From: Alex Rousskov Date: Thu, 17 Jan 2013 04:27:30 +0000 (-0700) Subject: Made "make check" happier. Needs more work. X-Git-Tag: SQUID_3_5_0_1~444^2~78 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93278786400848aa7b9da06340e6bb733e7a9b3d;p=thirdparty%2Fsquid.git Made "make check" happier. Needs more work. --- diff --git a/src/Makefile.am b/src/Makefile.am index f829646f4a..f73c787555 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2546,6 +2546,7 @@ tests_testHttpParser_SOURCES = \ tests/stub_debug.cc \ tests/stub_event.cc \ tests/stub_HelperChildConfig.cc \ + tests/stub_store.cc \ tools.h \ tests/stub_tools.cc \ tests/testHttpParser.cc \ @@ -3261,6 +3262,7 @@ tests_testRock_SOURCES = \ int.cc \ SquidList.h \ SquidList.cc \ + $(SBUF_SOURCE) \ Mem.h \ mem.cc \ MemBuf.cc \ diff --git a/src/tests/stub_MemStore.cc b/src/tests/stub_MemStore.cc index 6f586596bf..7f343c32c7 100644 --- a/src/tests/stub_MemStore.cc +++ b/src/tests/stub_MemStore.cc @@ -15,7 +15,7 @@ bool MemStore::keepInLocalMemory(const StoreEntry &) const STUB_RETVAL(false) void MemStore::considerKeeping(StoreEntry &) STUB void MemStore::reference(StoreEntry &) STUB void MemStore::maintain() STUB -void MemStore::cleanReadable(const sfileno) STUB +void MemStore::noteFreeMapSlice(const sfileno) STUB void MemStore::get(String const, STOREGETCLIENT, void *) STUB void MemStore::init() STUB void MemStore::getStats(StoreInfoStats&) const STUB diff --git a/src/tests/stub_store.cc b/src/tests/stub_store.cc index 50ee2f7b9c..9050a76718 100644 --- a/src/tests/stub_store.cc +++ b/src/tests/stub_store.cc @@ -83,10 +83,11 @@ void StoreEntry::setReleaseFlag() STUB void StoreEntry::append(char const *, int len) STUB void StoreEntry::buffer() STUB void StoreEntry::flush() STUB -int StoreEntry::unlock() STUB_RETVAL(0) +int StoreEntry::unlock(const char *) STUB_RETVAL(0) int64_t StoreEntry::objectLen() const STUB_RETVAL(0) int64_t StoreEntry::contentLen() const STUB_RETVAL(0) -void StoreEntry::lock() STUB +void StoreEntry::lock(const char *) STUB +void StoreEntry::touch() STUB void StoreEntry::release() STUB NullStoreEntry *NullStoreEntry::getInstance() STUB_RETVAL(NULL)