Improved automake 1.13+ support in unit-tests

Automake 1.13+ are warning about subdir-objects being enabled in
future versions but Squid currently relies on several environment
constructs that prevent that feature from working.

* All cppunit tests share a main() implementation in testMain.cc
  which is not able to easily be built as a .o from locations
  such as compat/.

  Fix this by making the code to include/unitTestMain.h and
  including it as an inline main() definition for all cppunit
  tests core .cc files.

* lib/testAll unit test

  Fix by splitting out into multiple unit-test binaries as is done
  by the rest of Squid. And removing duplicate testMain.cc.

* lib/ and src/ objects link to objects in child directories

  Enable subdir-objects when possible. Some remain due to
  depending on stubs files in the not yet created src/tests/ build
  directory. That will be fixed in a future commit.

diff --git a/compat/Makefile.am b/compat/Makefile.am
index 805ccb91171c51a1f99a2089b8b26c49982e7d62..f86592a822c82d0356f9109ac83e2373b5200d6d 100644 (file)
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -10,6 +10,7 @@
 
 include $(top_srcdir)/src/Common.am
 
+AUTOMAKE_OPTIONS = subdir-objects
 
 # Ideally this would be 100% inline functions and macro wrappers.
 
@@ -95,8 +96,7 @@ TESTS += testPreCompiler
 
 testPreCompiler_SOURCES= \
        testPreCompiler.h \
-       testPreCompiler.cc \
-       $(top_srcdir)/src/tests/testMain.cc
+       testPreCompiler.cc
 testPreCompiler_LDADD= $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS)
 testPreCompiler_LDFLAGS=
 

diff --git a/compat/testPreCompiler.cc b/compat/testPreCompiler.cc
index dc9f9a77d0e723d7498c2455112c1d582cbe4cd4..12e67e6a8f9c07aafc0703c1730b6f86b16a8a0e 100644 (file)
--- a/compat/testPreCompiler.cc
+++ b/compat/testPreCompiler.cc
@@ -8,6 +8,7 @@
 
 #include "squid.h"
 #include "testPreCompiler.h"
+#include "unitTestMain.h"
 
 #include <cassert>
 

diff --git a/src/tests/testMain.cc b/include/unitTestMain.h
similarity index 89%
rename from src/tests/testMain.cc
rename to include/unitTestMain.h
index e156fcc14d900485e901080cbd5702cb1ee3f1ce..45dfc1fa46991295f9ffd5f9fa7c0b1f02b6f6dd 100644 (file)
--- a/src/tests/testMain.cc
+++ b/include/unitTestMain.h
@@ -6,6 +6,9 @@
  * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
+#ifndef SQUID_INCLUDE_UNITTESTMAIN_H
+#define SQUID_INCLUDE_UNITTESTMAIN_H
+
 #include "squid.h"
 
 #include <cppunit/BriefTestProgressListener.h>
@@ -29,6 +32,7 @@ main( int argc, char* argv[] )
     // Add a listener that print dots as test run.
     // use BriefTestProgressListener to get names of each test
     // even when they pass.
+//    CPPUNIT_NS::BriefTestProgressListener progress;
     CPPUNIT_NS::TextTestProgressListener progress;
     controller.addListener( &progress );
 
@@ -44,3 +48,4 @@ main( int argc, char* argv[] )
     return result.wasSuccessful() ? 0 : 1;
 }
 
+#endif /* SQUID_INCLUDE_UNITTESTMAIN_H */

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 751545fcea885a0945bf1643a1ae9712d310c516..3480f479cbf623d71c25e94e08967189ab649a66 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,6 +7,8 @@
 
 include $(top_srcdir)/src/Common.am
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 DIST_SUBDIRS = ntlmauth profiler rfcnb smblib libTrie snmplib
 SUBDIRS=
 EXTRA_DIST=
@@ -79,24 +81,33 @@ libmiscutil_la_SOURCES = \
        util.c \
        xusleep.c
 
-TESTS += tests/testAll
+TESTS += tests/testRFC1035 tests/testRFC1738
 
-check_PROGRAMS += tests/testAll
+check_PROGRAMS += tests/testRFC1035 tests/testRFC1738
 
-tests_testAll_SOURCES= \
+tests_testRFC1035_SOURCES= \
        tests/testRFC1035.h \
-       tests/testRFC1035.cc \
+       tests/testRFC1035.cc
+
+tests_testRFC1035_LDADD= \
+       $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMPAT_LIB)
+
+tests_testRFC1035_LDFLAGS = $(LIBADD_DL)
+
+tests_testRFC1738_SOURCES= \
        tests/testRFC1738.h \
-       tests/testRFC1738.cc \
-       tests/testMain.cc
+       tests/testRFC1738.cc
 
-tests_testAll_LDADD= \
+tests_testRFC1738_LDADD= \
        $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(COMPAT_LIB)
 
-tests_testAll_LDFLAGS = $(LIBADD_DL)
+tests_testRFC1738_LDFLAGS = $(LIBADD_DL)
 
 
 ## Special Universal .h dependency test script

diff --git a/lib/tests/testMain.cc b/lib/tests/testMain.cc
deleted file mode 100644 (file)
index 590f7b8..0000000
--- a/lib/tests/testMain.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
- *
- * Squid software is distributed under GPLv2+ license and includes
- * contributions from numerous individuals and organizations.
- * Please see the COPYING and CONTRIBUTORS files for details.
- */
-
-#include "squid.h"
-
-#include <cppunit/BriefTestProgressListener.h>
-#include <cppunit/CompilerOutputter.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/TestResult.h>
-#include <cppunit/TestResultCollector.h>
-#include <cppunit/TestRunner.h>
-
-int
-main( int argc, char* argv[] )
-{
-    // Create the event manager and test controller
-    CPPUNIT_NS::TestResult controller;
-
-    // Add a listener that colllects test result
-    CPPUNIT_NS::TestResultCollector result;
-    controller.addListener( &result );
-
-    // Add a listener that print dots as test run.
-    CPPUNIT_NS::BriefTestProgressListener progress;
-    controller.addListener( &progress );
-
-    // Add the top suite to the test runner
-    CPPUNIT_NS::TestRunner runner;
-    runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() );
-    runner.run( controller );
-
-    // Print test in a compiler compatible format.
-    CPPUNIT_NS::CompilerOutputter outputter( &result, std::cerr );
-    outputter.write();
-
-    return result.wasSuccessful() ? 0 : 1;
-}
-

diff --git a/lib/tests/testRFC1035.cc b/lib/tests/testRFC1035.cc
index ee3684ef4e82c402301b5f4b9d0e343a104329e8..b17ec0a48a6d0f60e2b9ef246e285e2644f9faec 100644 (file)
--- a/lib/tests/testRFC1035.cc
+++ b/lib/tests/testRFC1035.cc
@@ -8,6 +8,7 @@
 
 #include "squid.h"
 #include "testRFC1035.h"
+#include "unitTestMain.h"
 
 #include <cassert>
 

diff --git a/lib/tests/testRFC1738.cc b/lib/tests/testRFC1738.cc
index 640d361baf12fc42a14fd321534f22e7c75d8b22..9440900900f2372852419163a5c463e03b90f1ee 100644 (file)
--- a/lib/tests/testRFC1738.cc
+++ b/lib/tests/testRFC1738.cc
@@ -8,6 +8,7 @@
 
 #include "squid.h"
 #include "testRFC1738.h"
+#include "unitTestMain.h"
 
 #include <cassert>
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 955cad651309ff103215c93c4732ed8e503d4559..bea061c87fbfc8319eee81208a7bf1f54131519f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1093,7 +1093,6 @@ TESTS += $(check_PROGRAMS)
 #tests_testX_SOURCES=\
 #      tests/testX.h \
 #      tests/testX.cc \
-#      tests/testMain.cc \
 #      X.h \
 #      X.cc
 #nodist_tests_testX_SOURCES=\
@@ -1187,7 +1186,6 @@ tests_testHttpReply_SOURCES=\
        tests/stub_HttpRequest.cc \
        tests/testHttpReply.cc \
        tests/testHttpReply.h \
-       tests/testMain.cc \
        tests/stub_time.cc \
        url.cc \
        wordlist.h \
@@ -1320,7 +1318,6 @@ tests_testACLMaxUserIP_SOURCES= \
        tests/stub_UdsOp.cc \
        tests/testACLMaxUserIP.cc \
        tests/testACLMaxUserIP.h \
-       tests/testMain.cc \
        tests/stub_time.cc \
        url.cc \
        URL.h \
@@ -1364,7 +1361,6 @@ tests_testACLMaxUserIP_LDFLAGS = $(LIBADD_DL)
 ## involved in writing tests.
 tests_testBoilerplate_SOURCES = \
        tests/testBoilerplate.cc \
-       tests/testMain.cc \
        tests/testBoilerplate.h \
        tests/stub_debug.cc \
        tests/stub_time.cc
@@ -1392,7 +1388,6 @@ tests_testCacheManager_SOURCES = \
        String.cc \
        tests/testCacheManager.cc \
        tests/testCacheManager.h \
-       tests/testMain.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
        tests/stub_store_stats.cc \
@@ -1751,7 +1746,6 @@ tests_testDiskIO_SOURCES = \
        tests/stub_UdsOp.cc \
        tests/testDiskIO.cc \
        tests/testDiskIO.h \
-       tests/testMain.cc \
        tests/testStoreSupport.cc \
        tests/testStoreSupport.h \
        tests/stub_time.cc \
@@ -1980,7 +1974,6 @@ tests_testEvent_SOURCES = \
        tests/CapturingStoreEntry.h \
        tests/testEvent.cc \
        tests/testEvent.h \
-       tests/testMain.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
        tests/stub_libauth_acls.cc \
@@ -2223,7 +2216,6 @@ tests_testEventLoop_SOURCES = \
        tests/stub_SwapDir.cc \
        tests/testEventLoop.cc \
        tests/testEventLoop.h \
-       tests/testMain.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
        tests/stub_libauth_acls.cc \
@@ -2559,7 +2551,6 @@ tests_testHttp1Parser_SOURCES = \
        tests/stub_tools.cc \
        tests/testHttp1Parser.cc \
        tests/testHttp1Parser.h \
-       tests/testMain.cc \
        tests/stub_time.cc \
        wordlist.h \
        wordlist.cc
@@ -2592,7 +2583,6 @@ tests_testHttpRequest_SOURCES = \
        tests/testHttpRequest.cc \
        tests/testHttpRequestMethod.h \
        tests/testHttpRequestMethod.cc \
-       tests/testMain.cc \
        tests/stub_DiskIOModule.cc \
        tests/stub_libauth.cc \
        tests/stub_main_cc.cc \
@@ -2939,7 +2929,6 @@ tests_testStore_SOURCES= \
        Transients.cc \
        tests/stub_tools.cc \
        tests/stub_UdsOp.cc \
-       tests/testMain.cc \
        tests/testStore.cc \
        tests/testStore.h \
        tests/testStoreEntryStream.cc \
@@ -3004,7 +2993,6 @@ tests_testString_SOURCES = \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
-       tests/testMain.cc \
        tests/testString.cc \
        tests/testString.h \
        cache_cf.h \
@@ -3052,7 +3040,6 @@ SWAP_TEST_DS =\
 
 tests_testUfs_SOURCES = \
        tests/testUfs.cc \
-       tests/testMain.cc \
        tests/testUfs.h \
        tests/stub_cache_manager.cc \
        tests/stub_client_db.cc \
@@ -3324,7 +3311,6 @@ tests_testRock_SOURCES = \
        Transients.h \
        Transients.cc \
        tests/testRock.cc \
-       tests/testMain.cc \
        tests/testRock.h \
        tests/testStoreSupport.cc \
        tests/testStoreSupport.h \
@@ -3588,7 +3574,6 @@ tests_testURL_SOURCES = \
        tests/testURL.h \
        tests/testUriScheme.cc \
        tests/testUriScheme.h \
-       tests/testMain.cc \
        tests/stub_time.cc \
        tests/stub_EventLoop.cc \
        tools.h \
@@ -3656,7 +3641,6 @@ tests_testURL_DEPENDENCIES = \
 tests_testSBuf_SOURCES= \
        tests/testSBuf.h \
        tests/testSBuf.cc \
-       tests/testMain.cc \
        tests/SBufFindTest.h \
        tests/SBufFindTest.cc \
        $(SBUF_SOURCE) \
@@ -3694,7 +3678,6 @@ tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
 tests_testSBufList_SOURCES= \
        tests/testSBufList.h \
        tests/testSBufList.cc \
-       tests/testMain.cc \
        $(SBUF_SOURCE) \
        SBufList.h \
        SBufList.cc \
@@ -3748,7 +3731,6 @@ tests_testConfigParser_SOURCES = \
        ConfigParser.cc \
        fatal.h \
        tests/stub_fatal.cc \
-       tests/testMain.cc \
        tests/testConfigParser.cc \
        tests/testConfigParser.h \
        cache_cf.h \
@@ -3805,7 +3787,6 @@ tests_testStatHist_SOURCES = \
        time.cc \
        tools.h \
        tests/stub_tools.cc \
-       tests/testMain.cc \
        tests/testStatHist.cc \
        tests/testStatHist.h
 nodist_tests_testStatHist_SOURCES = \

diff --git a/src/base/Makefile.am b/src/base/Makefile.am
index c296a2d2090fa48454058ef99353f9c0589cee7b..39bc3287a50bb7d6aeeae2e42b21f2fbdb7fe64b 100644 (file)
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@ -44,7 +44,6 @@ testCharacterSet_SOURCES = \
        testCharacterSet.h \
        testCharacterSet.cc
 nodist_testCharacterSet_SOURCES = \
-       $(top_srcdir)/src/tests/testMain.cc \
        $(top_srcdir)/src/tests/stub_debug.cc \
        $(top_srcdir)/src/tests/stub_MemBuf.cc \
        $(top_srcdir)/src/tests/stub_cbdata.cc

diff --git a/src/base/testCharacterSet.cc b/src/base/testCharacterSet.cc
index 41abf3a4f7573175389b0df9beb555f6fde9b904..6bebecf02209122c008a34e6dc96df19a4b08e32 100644 (file)
--- a/src/base/testCharacterSet.cc
+++ b/src/base/testCharacterSet.cc
@@ -9,6 +9,8 @@
 #include "squid.h"
 #include "base/CharacterSet.h"
 #include "testCharacterSet.h"
+#include "unitTestMain.h"
+
 
 #include <string>
 

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 97800289bde2a01be462001781dbcf1d09248721..704956ae76ac1724bc209131f0399c0b5b294c17 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -7,6 +7,8 @@
 
 include $(top_srcdir)/src/Common.am
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 EXTRA_LTLIBRARIES = libaufs.la libdiskd.la libufs.la librock.la
 noinst_LTLIBRARIES =  $(STORE_LIBS_TO_BUILD) libfs.la
 

diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am
index 27e4d2eade7a2e73884409c6433654c0fecdcde9..044aa5da2a31923294b635e773dc0fc0cecd4d6a 100644 (file)
--- a/src/icmp/Makefile.am
+++ b/src/icmp/Makefile.am
@@ -109,7 +109,6 @@ testIcmp_SOURCES = \
        testIcmp.h \
        testIcmp.cc
 nodist_testIcmp_SOURCES = \
-       $(top_srcdir)/src/tests/testMain.cc \
        $(top_srcdir)/src/SquidTime.h \
        $(top_srcdir)/src/tests/stub_debug.cc \
        $(top_srcdir)/src/time.cc \

diff --git a/src/icmp/testIcmp.cc b/src/icmp/testIcmp.cc
index de9722a358d25bafe4bc8b993ad8a93bca7b18c6..f8eee8228c0137f3a2287b2e820bcdf6e641f106 100644 (file)
--- a/src/icmp/testIcmp.cc
+++ b/src/icmp/testIcmp.cc
@@ -13,6 +13,8 @@
 #include <cppunit/TestAssert.h>
 
 #include "testIcmp.h"
+#include "unitTestMain.h"
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testIcmp );
 

diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index 117b292150bbd2addd454facef086eddcd3219cc..a63d29ec5bfc5217088bf29ff3fcb33cac066068 100644 (file)
--- a/src/ip/Makefile.am
+++ b/src/ip/Makefile.am
@@ -31,8 +31,7 @@ testIpAddress_SOURCES= \
        testAddress.h
 nodist_testIpAddress_SOURCES= \
        $(top_srcdir)/src/tests/stub_debug.cc \
-       $(top_srcdir)/src/tests/stub_tools.cc \
-       $(top_srcdir)/src/tests/testMain.cc
+       $(top_srcdir)/src/tests/stub_tools.cc
 testIpAddress_LDADD= \
        libip.la \
        ../base/libbase.la \

diff --git a/src/ip/testAddress.cc b/src/ip/testAddress.cc
index 2f36587f954a3a7cf9c06f2d8de85ac3c6486e73..5bb5068a5096db8535e4d04463c75539a2b8872f 100644 (file)
--- a/src/ip/testAddress.cc
+++ b/src/ip/testAddress.cc
@@ -10,6 +10,8 @@
 #include "ip/Address.h"
 #include "ip/tools.h"
 #include "testAddress.h"
+#include "unitTestMain.h"
+
 
 #include <cstring>
 #include <stdexcept>

diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am
index 92ea21bed563e741732fb82d9b76b2e9f062f3fd..7c2281fde846c66a9c993c6cf27e23010b8e5f79 100644 (file)
--- a/src/ipc/Makefile.am
+++ b/src/ipc/Makefile.am
@@ -8,6 +8,8 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 noinst_LTLIBRARIES = libipc.la
 
 libipc_la_SOURCES = \

diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index d3574ae5cd39e3a678a8f93456afb3e1ae50c19e..125cc8a39d9824e9e64c8f962dfadf6c4808b1cf 100644 (file)
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -40,7 +40,6 @@ testTokenizer_SOURCES = \
        testTokenizer.cc \
        Tokenizer.h
 nodist_testTokenizer_SOURCES = \
-       $(top_srcdir)/src/tests/testMain.cc \
        $(top_srcdir)/src/tests/stub_libmem.cc \
        $(top_srcdir)/src/tests/stub_debug.cc \
        $(top_srcdir)/src/tests/stub_time.cc \

diff --git a/src/parser/testTokenizer.cc b/src/parser/testTokenizer.cc
index 77b0568bafd17bef17caa9b105ef631b503c5a3d..4e7f8451dd488d5e104446a6aeeed9b2b2a93e68 100644 (file)
--- a/src/parser/testTokenizer.cc
+++ b/src/parser/testTokenizer.cc
@@ -10,6 +10,8 @@
 #include "base/CharacterSet.h"
 #include "parser/Tokenizer.h"
 #include "testTokenizer.h"
+#include "unitTestMain.h"
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testTokenizer );
 

diff --git a/src/tests/testACLMaxUserIP.cc b/src/tests/testACLMaxUserIP.cc
index c0df8af94b6d48af5a50fe18fdde27a190134553..3e206af9d71fce3d56cc1308da0fbe075da82195 100644 (file)
--- a/src/tests/testACLMaxUserIP.cc
+++ b/src/tests/testACLMaxUserIP.cc
@@ -13,6 +13,7 @@
 #include "auth/AclMaxUserIp.h"
 #include "ConfigParser.h"
 #include "testACLMaxUserIP.h"
+#include "unitTestMain.h"
 
 #include <stdexcept>
 

diff --git a/src/tests/testAuth.cc b/src/tests/testAuth.cc
index 4c474245357270e4b3d7f40cadcb9f22eb30854e..7548a9dceb290a0f90f710f7d2a11ec5b7ade974 100644 (file)
--- a/src/tests/testAuth.cc
+++ b/src/tests/testAuth.cc
@@ -16,6 +16,7 @@
 #include "auth/UserRequest.h"
 #include "ConfigParser.h"
 #include "testAuth.h"
+#include "unitTestMain.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testAuth );
 CPPUNIT_TEST_SUITE_REGISTRATION( testAuthConfig );

diff --git a/src/tests/testBoilerplate.cc b/src/tests/testBoilerplate.cc
index 87d935af2042da010a9e2fdfb9895cfa8eb10e49..c81037d1111b59e7186fdbb7394936b70f59ae38 100644 (file)
--- a/src/tests/testBoilerplate.cc
+++ b/src/tests/testBoilerplate.cc
@@ -8,6 +8,7 @@
 
 #include "squid.h"
 #include "testBoilerplate.h"
+#include "unitTestMain.h"
 
 #include <stdexcept>
 

diff --git a/src/tests/testCacheManager.cc b/src/tests/testCacheManager.cc
index 53fcb8c3431eac22cb7bf925e4fdf2f3eba40cbf..1b8e58db688151f098a6b58d592a5cd2f6f2b1ac 100644 (file)
--- a/src/tests/testCacheManager.cc
+++ b/src/tests/testCacheManager.cc
@@ -11,6 +11,7 @@
 #include "mgr/Action.h"
 #include "Store.h"
 #include "testCacheManager.h"
+#include "unitTestMain.h"
 
 #include <cppunit/TestAssert.h>
 

diff --git a/src/tests/testConfigParser.cc b/src/tests/testConfigParser.cc
index a98f9297f5aafc9297b3cfc399a6b2840b514699..9759966d63a54967f39efbd1f4cc4f73a279406f 100644 (file)
--- a/src/tests/testConfigParser.cc
+++ b/src/tests/testConfigParser.cc
@@ -11,6 +11,8 @@
 #include "event.h"
 #include "SquidString.h"
 #include "testConfigParser.h"
+#include "unitTestMain.h"
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testConfigParser);
 

diff --git a/src/tests/testDiskIO.cc b/src/tests/testDiskIO.cc
index cb48eeea61c06e4d77796ff070526dafd52d3bd2..e86e836c913181d729ee2c2ae14da3f89d45cb77 100644 (file)
--- a/src/tests/testDiskIO.cc
+++ b/src/tests/testDiskIO.cc
@@ -16,6 +16,8 @@
 #include "SwapDir.h"
 #include "testDiskIO.h"
 #include "testStoreSupport.h"
+#include "unitTestMain.h"
+
 
 #include <stdexcept>
 

diff --git a/src/tests/testEvent.cc b/src/tests/testEvent.cc
index c3174c8bfbd1f40d435f2a51b01b3e41faabfe42..7b0c3d458ab0f722887e0fa7b1e64e72dbdf3154 100644 (file)
--- a/src/tests/testEvent.cc
+++ b/src/tests/testEvent.cc
@@ -15,6 +15,8 @@
 #include "event.h"
 #include "stat.h"
 #include "testEvent.h"
+#include "unitTestMain.h"
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testEvent );
 

diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc
index ed7b37893e6d75cd8f3f61343e38b6ec0e3c8578..0255a6c5b8cfb500d14957ae6432028ade1f00aa 100644 (file)
--- a/src/tests/testEventLoop.cc
+++ b/src/tests/testEventLoop.cc
@@ -16,6 +16,8 @@
 #include "SquidTime.h"
 #include "stat.h"
 #include "testEventLoop.h"
+#include "unitTestMain.h"
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testEventLoop );
 

diff --git a/src/tests/testHttp1Parser.cc b/src/tests/testHttp1Parser.cc
index 70bb087354354b7fd6100789ca90a1e841dbbf9d..4662733771abc68090d550ddce6b4080857429ac 100644 (file)
--- a/src/tests/testHttp1Parser.cc
+++ b/src/tests/testHttp1Parser.cc
@@ -19,6 +19,8 @@
 #include "SquidConfig.h"
 #include "testHttp1Parser.h"
 #include "testHttp1Parser.h"
+#include "unitTestMain.h"
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttp1Parser );
 

diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc
index f9702ece7e53cba17ca74b42b00c9fe434381df9..f0ef0038d6e32171e41081e3d4479078c6be276d 100644 (file)
--- a/src/tests/testHttpReply.cc
+++ b/src/tests/testHttpReply.cc
@@ -14,6 +14,8 @@
 #include "mime_header.h"
 #include "SquidConfig.h"
 #include "testHttpReply.h"
+#include "unitTestMain.h"
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpReply );
 

diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc
index b760d814f7852c613000e3cd9da8888e58b41629..08b0ee4aed8c30ad40fa4da5dd395ee2569d8131 100644 (file)
--- a/src/tests/testHttpRequest.cc
+++ b/src/tests/testHttpRequest.cc
@@ -14,6 +14,8 @@
 #include "HttpRequest.h"
 #include "mime_header.h"
 #include "testHttpRequest.h"
+#include "unitTestMain.h"
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpRequest );
 

diff --git a/src/tests/testRock.cc b/src/tests/testRock.cc
index 38b2175cf9424f9ca010dede62f4301e571c0ee2..9e25a91f948742e4d8453e6f9a6afc6c7428f2e6 100644 (file)
--- a/src/tests/testRock.cc
+++ b/src/tests/testRock.cc
@@ -22,6 +22,8 @@
 #include "SwapDir.h"
 #include "testRock.h"
 #include "testStoreSupport.h"
+#include "unitTestMain.h"
+
 
 #include <stdexcept>
 #if HAVE_SYS_STAT_H

diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc
index f1415165cf7155bdbfe607a430df14b7e01cadfe..2709e93ca6d618d244100b4614758f2cd76bedad 100644 (file)
--- a/src/tests/testSBuf.cc
+++ b/src/tests/testSBuf.cc
@@ -13,6 +13,8 @@
 #include "SBufStream.h"
 #include "SquidString.h"
 #include "testSBuf.h"
+#include "unitTestMain.h"
+
 
 #include <iostream>
 #include <stdexcept>

diff --git a/src/tests/testSBufList.cc b/src/tests/testSBufList.cc
index e9e85c28d0bd30c6b5046e12a2c07868da830b76..03fd77cdc8a75d4db0c3502d5720ad72fc795c0b 100644 (file)
--- a/src/tests/testSBufList.cc
+++ b/src/tests/testSBufList.cc
@@ -10,6 +10,8 @@
 #include "SBufAlgos.h"
 #include "SBufList.h"
 #include "testSBufList.h"
+#include "unitTestMain.h"
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testSBufList );
 

diff --git a/src/tests/testStatHist.cc b/src/tests/testStatHist.cc
index a81d81b8d220081fe5962de56c6d1620b352604c..abcfb63997ffa7b0a73aa60f00fb3cee8e6d415b 100644 (file)
--- a/src/tests/testStatHist.cc
+++ b/src/tests/testStatHist.cc
@@ -9,6 +9,8 @@
 #include "squid.h"
 #include "StatHist.h"
 #include "testStatHist.h"
+#include "unitTestMain.h"
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION(testStatHist);
 

diff --git a/src/tests/testStore.cc b/src/tests/testStore.cc
index 3ea9a467de6bc99086daada7ae03fc5394ae9991..0aa855caa52de97fc79bcb5fca00e44ee2420bbe 100644 (file)
--- a/src/tests/testStore.cc
+++ b/src/tests/testStore.cc
@@ -9,6 +9,8 @@
 #include "squid.h"
 #include "Store.h"
 #include "testStore.h"
+#include "unitTestMain.h"
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testStore );
 

diff --git a/src/tests/testString.cc b/src/tests/testString.cc
index 54599f9a79813f737f9c8d177a8f1907b1eabb03..5f19927c32664995aaf8fb87f688883916699cfb 100644 (file)
--- a/src/tests/testString.cc
+++ b/src/tests/testString.cc
@@ -10,6 +10,8 @@
 #include "event.h"
 #include "SquidString.h"
 #include "testString.h"
+#include "unitTestMain.h"
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testString );
 

diff --git a/src/tests/testURL.cc b/src/tests/testURL.cc
index 68709360ca5885cdd02df82eedfae9d118180793..de02cb11778dc8b2d864d3df8791769c94abcdde 100644 (file)
--- a/src/tests/testURL.cc
+++ b/src/tests/testURL.cc
@@ -12,6 +12,8 @@
 
 #include "testURL.h"
 #include "URL.h"
+#include "unitTestMain.h"
+
 
 #include <sstream>
 

diff --git a/src/tests/testUfs.cc b/src/tests/testUfs.cc
index 7edc612efcdd9440fdab9c19adca807b87a4e47f..69cd80ff6d921b7a0877921e2917737dbf5856ab 100644 (file)
--- a/src/tests/testUfs.cc
+++ b/src/tests/testUfs.cc
@@ -19,6 +19,8 @@
 #include "SwapDir.h"
 #include "testStoreSupport.h"
 #include "testUfs.h"
+#include "unitTestMain.h"
+
 
 #include <stdexcept>