Stub-ified store_digest.cc, fixed stub_CacheDigest.cc

diff --git a/src/Makefile.am b/src/Makefile.am
index 65f2a1407cc6e5b4a4c89a9fa59fc4749b349200..09613e69ec03e8d7dae003250b37f88fbbf01718 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1535,7 +1535,7 @@ tests_testCacheManager_SOURCES = \
        store.cc \
        store_client.cc \
        store_digest.h \
-       store_digest.cc \
+       tests/stub_store_digest.cc \
        store_dir.cc \
        store_io.cc \
        store_key_md5.h \
@@ -1956,7 +1956,7 @@ tests_testEvent_SOURCES = \
        store.cc \
        store_client.cc \
        store_digest.h \
-       store_digest.cc \
+       tests/stub_store_digest.cc \
        store_dir.cc \
        store_io.cc \
        store_key_md5.h \
@@ -2204,7 +2204,7 @@ tests_testEventLoop_SOURCES = \
        store.cc \
        store_client.cc \
        store_digest.h \
-       store_digest.cc \
+       tests/stub_store_digest.cc \
        store_dir.cc \
        store_io.cc \
        store_key_md5.h \
@@ -2448,7 +2448,7 @@ tests_test_http_range_SOURCES = \
        store.cc \
        store_client.cc \
        store_digest.h \
-       store_digest.cc \
+       tests/stub_store_digest.cc \
        store_dir.cc \
        store_key_md5.h \
        store_key_md5.cc \
@@ -2738,7 +2738,7 @@ tests_testHttpRequest_SOURCES = \
        store.cc \
        store_client.cc \
        store_digest.h \
-       store_digest.cc \
+       tests/stub_store_digest.cc \
        store_dir.cc \
        store_io.cc \
        store_key_md5.h \
@@ -3551,7 +3551,7 @@ tests_testURL_SOURCES = \
        store.cc \
        store_client.cc \
        store_digest.h \
-       store_digest.cc \
+       tests/stub_store_digest.cc \
        store_dir.cc \
        store_io.cc \
        store_key_md5.h \

diff --git a/src/tests/Stub.list b/src/tests/Stub.list
index 413164503884d37ef8519a491f23c4cdf6a2459e..0149ef845c6799d41a3d4196e7fa1fde0d6a5fbf 100644 (file)
--- a/src/tests/Stub.list
+++ b/src/tests/Stub.list
@@ -54,6 +54,7 @@ STUB_SOURCE= tests/STUB.h \
        tests/stub_stmem.cc \
        tests/stub_store.cc \
        tests/stub_store_client.cc \
+       tests/stub_store_digest.cc \
        tests/stub_store_rebuild.cc \
        tests/stub_store_stats.cc \
        tests/stub_store_swapout.cc \

diff --git a/src/tests/stub_CacheDigest.cc b/src/tests/stub_CacheDigest.cc
index d95f710f16547492d3d372cb6113bfd0bfa01c75..dffeeedab28aab8da1c43e958d3d881ce8f43400 100644 (file)
--- a/src/tests/stub_CacheDigest.cc
+++ b/src/tests/stub_CacheDigest.cc
@@ -1,10 +1,10 @@
 #include "squid.h"
+#include "typedefs.h" /* for cache_key */
 
 #define STUB_API "CacheDigest.cc"
 #include "tests/STUB.h"
 
 class CacheDigest;
-class cache_key;
 class CacheDigestGuessStats;
 class StoreEntry;
 

diff --git a/src/tests/stub_store_digest.cc b/src/tests/stub_store_digest.cc
new file mode 100644 (file)
index 0000000..f054d83
--- /dev/null
+++ b/src/tests/stub_store_digest.cc
@@ -0,0 +1,10 @@
+#include "squid.h"
+
+#define STUB_API "store_digets.cc"
+#include "tests/STUB.h"
+
+class StoreEntry;
+void storeDigestInit(void) STUB
+void storeDigestNoteStoreReady(void) STUB
+void storeDigestDel(const StoreEntry *) STUB
+void storeDigestReport(StoreEntry *) STUB