From: Francesco Chemolli Date: Mon, 28 Oct 2013 10:46:15 +0000 (+0100) Subject: Removed dependency on libauth from testEventLoop and test_http_range X-Git-Tag: SQUID_3_5_0_1~570^2~18 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f02539d90bdb3faf7bdb3608abd577fa0bb02932;p=thirdparty%2Fsquid.git Removed dependency on libauth from testEventLoop and test_http_range Prepared stub for external_acl --- diff --git a/src/Makefile.am b/src/Makefile.am index 0b630934e3..4fe441d583 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2048,7 +2048,6 @@ tests_testEvent_DEPENDENCIES = \ ## Tests of the EventLoop module. tests_testEventLoop_SOURCES = \ AccessLogEntry.cc \ - $(ACL_REGISTRATION_SOURCES) \ BodyPipe.cc \ CacheDigest.h \ CacheDigest.cc \ @@ -2232,6 +2231,7 @@ tests_testEventLoop_SOURCES = \ tests/testMain.cc \ tests/stub_main_cc.cc \ tests/stub_ipc_Forwarder.cc \ + tests/stub_libauth.cc \ tests/stub_libeui.cc \ tests/stub_store_stats.cc \ time.cc \ @@ -2260,7 +2260,6 @@ tests_testEventLoop_LDADD = \ ident/libident.la \ acl/libacls.la \ acl/libstate.la \ - $(AUTH_LIBS) \ acl/libapi.la \ base/libbase.la \ libsquid.la \ @@ -2297,7 +2296,6 @@ tests_testEventLoop_DEPENDENCIES = \ tests_test_http_range_SOURCES = \ AccessLogEntry.cc \ - $(ACL_REGISTRATION_SOURCES) \ BodyPipe.cc \ cache_cf.h \ AuthReg.h \ @@ -2337,10 +2335,9 @@ tests_test_http_range_SOURCES = \ errorpage.cc \ ETag.cc \ event.cc \ - external_acl.cc \ - ExternalACLEntry.cc \ FadingCounter.cc \ fatal.h \ + tests/stub_libauth.cc \ tests/stub_fatal.cc \ fd.h \ fd.cc \ @@ -2474,6 +2471,7 @@ tests_test_http_range_SOURCES = \ StrList.cc \ SwapDir.cc \ tests/test_http_range.cc \ + tests/stub_external_acl.cc \ tests/stub_ipc_Forwarder.cc \ tests/stub_libeui.cc \ tests/stub_main_cc.cc \ @@ -2500,7 +2498,6 @@ nodist_tests_test_http_range_SOURCES = \ $(DISKIO_GEN_SOURCE) tests_test_http_range_LDADD = \ http/libsquid-http.la \ - $(AUTH_ACL_LIBS) \ ident/libident.la \ acl/libacls.la \ acl/libstate.la \ diff --git a/src/tests/stub_external_acl.cc b/src/tests/stub_external_acl.cc new file mode 100644 index 0000000000..a5440133aa --- /dev/null +++ b/src/tests/stub_external_acl.cc @@ -0,0 +1,23 @@ +#include "squid.h" + +#define STUB_API "external_acl.cc" +#include "tests/STUB.h" + +#include "ExternalACL.h" +#include "ExternalACLEntry.h" + +void parse_externalAclHelper(external_acl ** ) STUB +void dump_externalAclHelper(StoreEntry *, const char *, const external_acl *) STUB +void free_externalAclHelper(external_acl **) STUB +void ACLExternal::parse() STUB +bool ACLExternal::valid () const STUB +bool ACLExternal::empty () const STUB +int ACLExternal::match(ACLChecklist *) STUB +wordlist * ACLExternal::dump() const STUB +void ACLExternal::ExternalAclLookup(ACLChecklist *, ACLExternal *) STUB +void ExternalACLLookup::Start(ACLChecklist *, external_acl_data *, bool) STUB +void externalAclInit(void) STUB_NOP +void externalAclShutdown(void) STUB_NOP +ExternalACLLookup * ExternalACLLookup::Instance() STUB +void ExternalACLLookup::checkForAsync(ACLChecklist *) const STUB +void ExternalACLLookup::LookupDone(void *, void *) STUB