Fix "make check" with GCC-10 (#677)

Latest GCC-10 release on some OS (Debian initially) no
longer locates files in "." by default. Fix Makefile hack
pulling tests/ files into tools/ for stub linking.

Also, Squid #includes under src/ are supposed to always
use path relative to src/. Fix wrong STUB.h references.

diff --git a/src/tests/stub_HttpControlMsg.cc b/src/tests/stub_HttpControlMsg.cc
index 89e9b1100d7caa7c01ec7653126e2a048a6b94a3..700ab7c517570d70e878ae3233f57244db7369c4 100644 (file)
--- a/src/tests/stub_HttpControlMsg.cc
+++ b/src/tests/stub_HttpControlMsg.cc
@@ -9,7 +9,7 @@
 #include "squid.h"
 
 #define STUB_API "HttpControlMsg.cc"
-#include "STUB.h"
+#include "tests/STUB.h"
 
 #include "HttpControlMsg.h"
 void HttpControlMsgSink::wroteControlMsg(CommIoCbParams const&) STUB

diff --git a/src/tests/stub_HttpHeader.cc b/src/tests/stub_HttpHeader.cc
index ee3b38784044758a070c118974e435cf4367ecdd..11054b14f0e19b82f33508e0433e1bc71a0d10a9 100644 (file)
--- a/src/tests/stub_HttpHeader.cc
+++ b/src/tests/stub_HttpHeader.cc
@@ -11,7 +11,7 @@
 #include "TimeOrTag.h"
 
 #define STUB_API "HttpHeader.cc"
-#include "STUB.h"
+#include "tests/STUB.h"
 
 #include "HttpHeader.h"
 HttpHeaderEntry::HttpHeaderEntry(Http::HdrType, const SBuf &, const char *) {STUB}

diff --git a/src/tests/stub_HttpUpgradeProtocolAccess.cc b/src/tests/stub_HttpUpgradeProtocolAccess.cc
index 71e006f91773e71c1e9a1c1c6e3979b8a930f818..ce14daec5c401ccd50e55d40dc554873051271d9 100644 (file)
--- a/src/tests/stub_HttpUpgradeProtocolAccess.cc
+++ b/src/tests/stub_HttpUpgradeProtocolAccess.cc
@@ -10,7 +10,7 @@
 #include "ConfigParser.h"
 
 #define STUB_API "HttpUpgradeProtocolAccess.cc"
-#include "STUB.h"
+#include "tests/STUB.h"
 
 #include "HttpUpgradeProtocolAccess.h"
 ProtocolView::ProtocolView(const char * const, const size_t) STUB

diff --git a/src/tests/stub_StatHist.cc b/src/tests/stub_StatHist.cc
index f2b3ca37b6229bb94a398a6f5ef10445a723ef56..859f2287a80169d268913fc46b39708e007b1431 100644 (file)
--- a/src/tests/stub_StatHist.cc
+++ b/src/tests/stub_StatHist.cc
@@ -10,7 +10,7 @@
 #include "StatHist.h"
 
 #define STUB_API "StatHist.cc"
-#include "STUB.h"
+#include "tests/STUB.h"
 
 class StoreEntry;
 

diff --git a/src/tests/stub_ipcache.cc b/src/tests/stub_ipcache.cc
index 090aec77bccfc6b7b20c75a1bbdf86fee8c298bf..1d1eb77e477173be6afda91c5da3d7da22d300bd 100644 (file)
--- a/src/tests/stub_ipcache.cc
+++ b/src/tests/stub_ipcache.cc
@@ -10,7 +10,7 @@
 #include "ipcache.h"
 
 #define STUB_API "ipcache.cc"
-#include "STUB.h"
+#include "tests/STUB.h"
 
 void ipcache_purgelru(void *) STUB
 void ipcache_nbgethostbyname(const char *name, IPH * handler, void *handlerData) STUB

diff --git a/src/tests/stub_libauth.cc b/src/tests/stub_libauth.cc
index 1ebc39c7206264e435a3c894f05d7b7da2e18b5e..f23b98b0b6a4575e3ac83cf9b5206560c877e8c6 100644 (file)
--- a/src/tests/stub_libauth.cc
+++ b/src/tests/stub_libauth.cc
@@ -9,7 +9,7 @@
 #include "squid.h"
 
 #define STUB_API "auth/libauth.la"
-#include "STUB.h"
+#include "tests/STUB.h"
 
 #if USE_AUTH
 #include "auth/SchemeConfig.h"

diff --git a/src/tests/stub_libauth_acls.cc b/src/tests/stub_libauth_acls.cc
index 12f32121f6ad5e0b0048acd9881713ef11044291..d7ee0e6144dcbcd5d025d4138efa40cc88936f99 100644 (file)
--- a/src/tests/stub_libauth_acls.cc
+++ b/src/tests/stub_libauth_acls.cc
@@ -9,7 +9,7 @@
 #include "squid.h"
 
 #define STUB_API "auth/libacls.la"
-#include "STUB.h"
+#include "tests/STUB.h"
 
 #if USE_AUTH
 #include "acl/Acl.h" /* for Acl::Answer */

diff --git a/src/tests/stub_libeui.cc b/src/tests/stub_libeui.cc
index a89434d9f18b7f49681b851ce65a637c50aff5d9..f18addc752eeae86b940f38796c57a1ba071d7a2 100644 (file)
--- a/src/tests/stub_libeui.cc
+++ b/src/tests/stub_libeui.cc
@@ -9,7 +9,7 @@
 #include "squid.h"
 
 #define STUB_API "eui/libeui.la"
-#include "STUB.h"
+#include "tests/STUB.h"
 
 #include "eui/Config.h"
 Eui::EuiConfig Eui::TheConfig;

diff --git a/src/tests/stub_libhttp.cc b/src/tests/stub_libhttp.cc
index 97d8a01679f33d2b5b8311c58e74a604208459e6..b5475018a5d8978f848b42e306f0b4229b672e4a 100644 (file)
--- a/src/tests/stub_libhttp.cc
+++ b/src/tests/stub_libhttp.cc
@@ -12,7 +12,7 @@
 #include "SquidConfig.h"
 
 #define STUB_API "http/libhttp.la"
-#include "STUB.h"
+#include "tests/STUB.h"
 
 #include "http/ContentLengthInterpreter.h"
 namespace Http

diff --git a/src/tests/stub_libicmp.cc b/src/tests/stub_libicmp.cc
index 20e2e8c0247eb7b7a7f833cd364697651d0e5411..959a818869779d10cf8bc8b158c2fd7a97cef0ee 100644 (file)
--- a/src/tests/stub_libicmp.cc
+++ b/src/tests/stub_libicmp.cc
@@ -8,7 +8,7 @@
 
 #include "squid.h"
 #define STUB_API "icmp/libicmp.la"
-#include "STUB.h"
+#include "tests/STUB.h"
 
 #include "icmp/IcmpSquid.h"
 //IcmpSquid::IcmpSquid() STUB

diff --git a/src/tests/stub_libmem.cc b/src/tests/stub_libmem.cc
index 422b685adb7c489dc558b2e0d651b25202fe4f7b..034da6dfa4cb4817ab34a4c90e3f8322e6fa3c43 100644 (file)
--- a/src/tests/stub_libmem.cc
+++ b/src/tests/stub_libmem.cc
@@ -9,7 +9,7 @@
 #include "squid.h"
 
 #define STUB_API "mem/libmem.la"
-#include "STUB.h"
+#include "tests/STUB.h"
 
 #include "mem/AllocatorProxy.h"
 void *Mem::AllocatorProxy::alloc() {return xmalloc(64*1024);}

diff --git a/src/tests/stub_time.cc b/src/tests/stub_time.cc
index dd5c55ae64d7ba6fc3d469dae4bdae7ff63dd5c1..6c5d44cc0cd4a1c1090bd52e5f5451ad059c8cfd 100644 (file)
--- a/src/tests/stub_time.cc
+++ b/src/tests/stub_time.cc
@@ -10,7 +10,7 @@
 #include "SquidTime.h"
 
 #define STUB_API "time.cc"
-#include "STUB.h"
+#include "tests/STUB.h"
 
 struct timeval current_time;
 double current_dtime;

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 92e9414c9c39454f46eb95f11a81d08b10bdbd65..d013f0ccbd3def8c5fb1c2a0195837e8bf96df71 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -31,7 +31,7 @@ include $(top_srcdir)/doc/manuals/Substitute.am
 test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc
        cp $(top_srcdir)/test-suite/test_tools.cc $@
 
-stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
+tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
        cp $(top_srcdir)/src/tests/stub_debug.cc $@
 
 Here.cc: $(top_srcdir)/src/base/Here.cc
@@ -46,13 +46,13 @@ MemBuf.cc: $(top_srcdir)/src/MemBuf.cc
 time.cc: $(top_srcdir)/src/time.cc
        cp $(top_srcdir)/src/time.cc $@
 
-stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc
+tests/stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc
        cp $(top_srcdir)/src/tests/stub_cbdata.cc $@
 
-stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
+tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc
        cp $(top_srcdir)/src/tests/stub_libmem.cc $@
 
-STUB.h: $(top_srcdir)/src/tests/STUB.h
+tests/STUB.h: $(top_srcdir)/src/tests/STUB.h
        cp $(top_srcdir)/src/tests/STUB.h $@
 
 # stock tools for unit tests - library independent versions of dlink_list
@@ -60,7 +60,7 @@ STUB.h: $(top_srcdir)/src/tests/STUB.h
 # globals.cc is needed by test_tools.cc.
 # Neither of these should be disted from here.
 TESTSOURCES= test_tools.cc
-CLEANFILES += test_tools.cc Here.cc CharacterSet.cc MemBuf.cc stub_debug.cc time.cc stub_cbdata.cc stub_libmem.cc STUB.h
+CLEANFILES += test_tools.cc Here.cc CharacterSet.cc MemBuf.cc tests/stub_debug.cc time.cc tests/stub_cbdata.cc tests/stub_libmem.cc tests/STUB.h
 
 ## Test Scripts
 EXTRA_DIST += helper-ok-dying.pl helper-ok.pl
@@ -75,14 +75,16 @@ cachemgr__CGIEXT__SOURCES = \
        CharacterSet.cc \
        Here.cc \
        MemBuf.cc \
-       STUB.h \
        cachemgr.cc \
-       stub_cbdata.cc \
-       stub_debug.cc \
-       stub_libmem.cc \
        test_tools.cc \
        time.cc
 
+nodist_cachemgr__CGIEXT__SOURCES = \
+       tests/STUB.h \
+       tests/stub_cbdata.cc \
+       tests/stub_debug.cc \
+       tests/stub_libmem.cc
+
 cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CXXFLAGS)
 
 EXTRA_DIST += cachemgr.conf cachemgr.cgi.8 cachemgr.cgi.8.in

diff --git a/tools/squidclient/Makefile.am b/tools/squidclient/Makefile.am
index f143790fcd929236e4486c54461fd0ac538d5cbe..c060abc39b89241075e1f97ada28234d71e4073b 100644 (file)
--- a/tools/squidclient/Makefile.am
+++ b/tools/squidclient/Makefile.am
@@ -30,25 +30,24 @@ include $(top_srcdir)/doc/manuals/Substitute.am
 test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc
        cp $(top_srcdir)/test-suite/test_tools.cc $@
 
-stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
+tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
        cp $(top_srcdir)/src/tests/stub_debug.cc $@
 
 time.cc: $(top_srcdir)/src/time.cc
        cp $(top_srcdir)/src/time.cc $@
 
-stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
+tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc
        cp $(top_srcdir)/src/tests/stub_libmem.cc $@
-       
-STUB.h: $(top_srcdir)/src/tests/STUB.h
+
+tests/STUB.h: $(top_srcdir)/src/tests/STUB.h
        cp $(top_srcdir)/src/tests/STUB.h $@
-       
 
 # stock tools for unit tests - library independent versions of dlink_list
 # etc.
 # globals.cc is needed by test_tools.cc.
 # Neither of these should be disted from here.
 TESTSOURCES= test_tools.cc
-CLEANFILES += test_tools.cc stub_debug.cc time.cc stub_libmem.cc STUB.h
+CLEANFILES += test_tools.cc tests/stub_debug.cc time.cc tests/stub_libmem.cc tests/STUB.h
 
 ## ##### squidclient  #####
 
@@ -58,13 +57,15 @@ squidclient_SOURCES = \
        Parameters.h \
        Ping.cc \
        Ping.h \
-       STUB.h \
        Transport.cc \
        Transport.h \
        gssapi_support.cc \
        gssapi_support.h \
        squidclient.cc \
-       stub_debug.cc \
-       stub_libmem.cc \
        test_tools.cc \
        time.cc
+
+nodist_squidclient_SOURCES = \
+       tests/stub_debug.cc \
+       tests/stub_libmem.cc \
+       tests/STUB.h