I get compile errors on many tests because Squid defines its own assert()

macro.  I find that it works better (ie compiles on FreeBSD) when
squid.h is the first include.  Then the compiler won't define its own
assert macro if Squid gets there first.

diff --git a/src/tests/testCoss.cc b/src/tests/testCoss.cc
index ee49993e126390059299fdb50dc767084f3c6946..89a51aa000467e3f51ec06814678c01972cd41bd 100644 (file)
--- a/src/tests/testCoss.cc
+++ b/src/tests/testCoss.cc
@@ -1,8 +1,7 @@
-#include "config.h"
+#include "squid.h"
 #include <stdexcept>
 
 #include "testCoss.h"
-#include "squid.h"
 #include "Store.h"
 #include "SwapDir.h"
 #include "DiskIO/DiskIOModule.h"

diff --git a/src/tests/testNull.cc b/src/tests/testNull.cc
index 6ec350776ba09afee8fbf8a5a7085f3942789b59..2fef3fe770a5234a4f7108a610f56e812daec4fd 100644 (file)
--- a/src/tests/testNull.cc
+++ b/src/tests/testNull.cc
@@ -1,8 +1,7 @@
-#include "config.h"
+#include "squid.h"
 #include <stdexcept>
 
 #include "testNull.h"
-#include "squid.h"
 #include "Store.h"
 #include "SwapDir.h"
 #include "DiskIO/DiskIOModule.h"

diff --git a/src/tests/testStore.cc b/src/tests/testStore.cc
index bc78a900869f7d7950d43549a11fb90778028bd3..76ea9736a439526389b7d18d7ddd9e81fc6b6149 100644 (file)
--- a/src/tests/testStore.cc
+++ b/src/tests/testStore.cc
@@ -1,7 +1,5 @@
-#include "config.h"
-
-#include "testStore.h"
 #include "squid.h"
+#include "testStore.h"
 #include "Store.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testStore );

diff --git a/src/tests/testStoreController.cc b/src/tests/testStoreController.cc
index adf3aa678a365297ce6c664b62733e21a55298a9..0f99ab89408e7640ce0e7e0654f045c6f5f55c78 100644 (file)
--- a/src/tests/testStoreController.cc
+++ b/src/tests/testStoreController.cc
@@ -1,7 +1,6 @@
-#include "config.h"
+#include "squid.h"
 
 #include "testStoreController.h"
-#include "squid.h"
 #include "Store.h"
 #include "SwapDir.h"
 #include "TestSwapDir.h"

diff --git a/src/tests/testStoreHashIndex.cc b/src/tests/testStoreHashIndex.cc
index b599cd7dd1f4b34c0333da2a017c3613af7392b3..e53fc7609bda0f0348abb7c7ff8bc5d723eb3fb2 100644 (file)
--- a/src/tests/testStoreHashIndex.cc
+++ b/src/tests/testStoreHashIndex.cc
@@ -1,7 +1,6 @@
-#include "config.h"
+#include "squid.h"
 
 #include "testStoreHashIndex.h"
-#include "squid.h"
 #include "Store.h"
 #include "SwapDir.h"
 #include "TestSwapDir.h"

diff --git a/src/tests/testUfs.cc b/src/tests/testUfs.cc
index adb318a62e8a393c8c53d07993670151e42fdcb6..578e3af405f4db9b8bbe3faf3b1464044c56f91b 100644 (file)
--- a/src/tests/testUfs.cc
+++ b/src/tests/testUfs.cc
@@ -1,8 +1,7 @@
-#include "config.h"
+#include "squid.h"
 #include <stdexcept>
 
 #include "testUfs.h"
-#include "squid.h"
 #include "Store.h"
 #include "SwapDir.h"
 #include "DiskIO/DiskIOModule.h"