From f0b3a732066ca6e94455247cd60983515fc84136 Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Tue, 30 Oct 2007 14:48:42 +0000
Subject: [PATCH] Fix boot auto unit tests for Boost V1.34 compatibility

---
 PPI/ActiveFeeder.test.cc                      |  2 +-
 PPI/CloneSource.test.cc                       |  2 +-
 PPI/Connectors.test.cc                        |  2 +-
 PPI/DebugEvent.test.cc                        |  2 +-
 PPI/DebugModules.test.cc                      |  2 +-
 PPI/DiscardSink.test.cc                       |  2 +-
 PPI/EventManager.test.cc                      |  2 +-
 PPI/Events.test.cc                            |  2 +-
 PPI/IOEvent.test.cc                           |  2 +-
 PPI/IdleEvent.test.cc                         |  2 +-
 PPI/IntervalTimer.test.cc                     |  2 +-
 PPI/Joins.test.cc                             |  2 +-
 PPI/Module.test.cc                            |  2 +-
 PPI/ModuleManager.test.cc                     |  2 +-
 PPI/PassiveQueue.test.cc                      |  2 +-
 PPI/Queueing.test.cc                          |  2 +-
 PPI/Route.test.cc                             |  2 +-
 PPI/Setup.test.cc                             |  2 +-
 PPI/SocketSink.test.cc                        |  2 +-
 PPI/SocketSource.test.cc                      |  2 +-
 PPI/ThrottleBarrier.test.cc                   |  2 +-
 PPI/main.test.cc                              |  2 +-
 Packets/DefaultBundle/EthernetPacket.test.cc  |  2 +-
 Packets/DefaultBundle/IpV4Packet.test.cc      |  2 +-
 Packets/DefaultBundle/IpV6Extensions.test.cc  |  2 +-
 Packets/DefaultBundle/IpV6Packet.test.cc      |  2 +-
 Packets/DefaultBundle/UDPPacket.test.cc       |  2 +-
 Packets/DefaultBundle/main.test.cc            |  2 +-
 Packets/MPEGDVBBundle/TLVPacket.test.cc       |  2 +-
 Packets/MPEGDVBBundle/TransportPacket.test.cc |  2 +-
 Packets/MPEGDVBBundle/main.test.cc            |  2 +-
 Packets/Packet.test.cc                        |  2 +-
 Packets/PacketData.test.cc                    |  2 +-
 Packets/PacketImpl.test.cc                    |  2 +-
 Packets/PacketInterpreter.test.cc             |  2 +-
 Packets/PacketParser.test.cc                  |  2 +-
 Packets/PacketRegistry.test.cc                |  2 +-
 Packets/ParseArray.test.cc                    |  2 +-
 Packets/ParseHelpers.test.cc                  |  2 +-
 Packets/ParseInt.test.cc                      |  2 +-
 Packets/ParseList.test.cc                     |  2 +-
 Packets/ParseListB.test.cc                    |  2 +-
 Packets/ParseListN.test.cc                    |  2 +-
 Packets/ParseVariant.test.cc                  |  2 +-
 Packets/ParseVec.test.cc                      |  2 +-
 Packets/main.test.cc                          |  2 +-
 Scheduler/ClockService.test.cc                |  2 +-
 Scheduler/ReadHelper.test.cc                  |  2 +-
 Scheduler/Scheduler.test.cc                   |  2 +-
 Scheduler/WriteHelper.test.cc                 |  2 +-
 Scheduler/main.test.cc                        |  2 +-
 Socket/ClientSocketHandle.test.cc             |  2 +-
 Socket/FileHandle.test.cc                     |  2 +-
 Socket/ProtocolClientSocketHandle.test.cc     |  2 +-
 Socket/ProtocolServerSocketHandle.test.cc     |  2 +-
 Socket/Protocols/DVB/main.test.cc             |  2 +-
 Socket/Protocols/INet/INet4Address.test.cc    |  2 +-
 Socket/Protocols/INet/INet6Address.test.cc    |  2 +-
 Socket/Protocols/INet/INetAddressing.test.cc  |  2 +-
 Socket/Protocols/INet/TCPSocketHandle.test.cc |  2 +-
 Socket/Protocols/INet/UDPSocketHandle.test.cc |  2 +-
 Socket/Protocols/INet/main.test.cc            |  2 +-
 Socket/Protocols/Raw/LLAddressing.test.cc     |  2 +-
 Socket/Protocols/Raw/MACAddress.test.cc       |  2 +-
 .../Protocols/Raw/PacketSocketHandle.test.cc  |  2 +-
 Socket/Protocols/Raw/main.test.cc             |  2 +-
 Socket/Protocols/UN/UNAddress.test.cc         |  2 +-
 Socket/Protocols/UN/UNAddressing.test.cc      |  2 +-
 .../UN/UNDatagramSocketHandle.test.cc         |  2 +-
 Socket/Protocols/UN/UNProtocol.test.cc        |  2 +-
 Socket/Protocols/UN/main.test.cc              |  2 +-
 Socket/Protocols/main.test.cc                 |  2 +-
 Socket/ServerSocketHandle.test.cc             |  2 +-
 Socket/SocketHandle.test.cc                   |  2 +-
 Socket/SocketPolicy.test.cc                   |  2 +-
 Socket/SocketProtocol.test.cc                 |  2 +-
 Socket/main.test.cc                           |  2 +-
 Utils/Buffer.test.cc                          |  2 +-
 Utils/Exception.test.cc                       |  2 +-
 Utils/IpChecksum.test.cc                      |  2 +-
 Utils/IteratorTraits.test.cc                  |  2 +-
 Utils/Logger/AreaRegistry.test.cc             |  2 +-
 Utils/Logger/Config.test.cc                   |  2 +-
 Utils/Logger/Log.test.cc                      |  2 +-
 Utils/Logger/Parameters.test.cc               |  2 +-
 Utils/Logger/StreamRegistry.test.cc           |  2 +-
 Utils/Logger/Target.test.cc                   |  2 +-
 Utils/Logger/main.test.cc                     |  2 +-
 Utils/SafeBool.test.cc                        |  2 +-
 Utils/TypeIdValue.test.cc                     |  2 +-
 Utils/TypeInfo.test.cc                        |  2 +-
 Utils/auto_unit_test.hh                       | 58 +++++++++++++++++++
 Utils/hexdump.test.cc                         |  2 +-
 Utils/intrusive_refcount.test.cc              |  2 +-
 Utils/main.test.cc                            |  2 +-
 Utils/membind.test.cc                         |  2 +-
 Utils/mpl.test.cc                             |  2 +-
 Utils/pool_alloc_mixin.test.cc                |  2 +-
 Utils/singleton.test.cc                       |  2 +-
 99 files changed, 156 insertions(+), 98 deletions(-)
 create mode 100644 Utils/auto_unit_test.hh

diff --git a/PPI/ActiveFeeder.test.cc b/PPI/ActiveFeeder.test.cc
index ac413c02e..efe99d71b 100644
--- a/PPI/ActiveFeeder.test.cc
+++ b/PPI/ActiveFeeder.test.cc
@@ -31,7 +31,7 @@
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/CloneSource.test.cc b/PPI/CloneSource.test.cc
index 544461ede..1b47375de 100644
--- a/PPI/CloneSource.test.cc
+++ b/PPI/CloneSource.test.cc
@@ -32,7 +32,7 @@
 #include "Setup.hh"
 #include "../Packets/Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Connectors.test.cc b/PPI/Connectors.test.cc
index 9277a34e9..25d7b19cb 100644
--- a/PPI/Connectors.test.cc
+++ b/PPI/Connectors.test.cc
@@ -31,7 +31,7 @@
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/DebugEvent.test.cc b/PPI/DebugEvent.test.cc
index 5eed5d953..b9b9444b6 100644
--- a/PPI/DebugEvent.test.cc
+++ b/PPI/DebugEvent.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "DebugEvent.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/DebugModules.test.cc b/PPI/DebugModules.test.cc
index a5e518389..646b8071b 100644
--- a/PPI/DebugModules.test.cc
+++ b/PPI/DebugModules.test.cc
@@ -37,7 +37,7 @@
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/DiscardSink.test.cc b/PPI/DiscardSink.test.cc
index 9e7bb3f6d..7135a0bf2 100644
--- a/PPI/DiscardSink.test.cc
+++ b/PPI/DiscardSink.test.cc
@@ -31,7 +31,7 @@
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/EventManager.test.cc b/PPI/EventManager.test.cc
index 5a4b771d3..ae34cf4c0 100644
--- a/PPI/EventManager.test.cc
+++ b/PPI/EventManager.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "EventManager.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Events.test.cc b/PPI/Events.test.cc
index 1c687cd19..23bf7465c 100644
--- a/PPI/Events.test.cc
+++ b/PPI/Events.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Events.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/IOEvent.test.cc b/PPI/IOEvent.test.cc
index 5c010fcc9..884c48060 100644
--- a/PPI/IOEvent.test.cc
+++ b/PPI/IOEvent.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "IOEvent.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/IdleEvent.test.cc b/PPI/IdleEvent.test.cc
index bd9688ac7..2d6649438 100644
--- a/PPI/IdleEvent.test.cc
+++ b/PPI/IdleEvent.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "IdleEvent.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/IntervalTimer.test.cc b/PPI/IntervalTimer.test.cc
index 9b49d2731..f2e92e6a9 100644
--- a/PPI/IntervalTimer.test.cc
+++ b/PPI/IntervalTimer.test.cc
@@ -31,7 +31,7 @@
 #include "Module.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Joins.test.cc b/PPI/Joins.test.cc
index fbe9e05bb..635e222bc 100644
--- a/PPI/Joins.test.cc
+++ b/PPI/Joins.test.cc
@@ -32,7 +32,7 @@
 #include "Setup.hh"
 #include "../Packets/Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Module.test.cc b/PPI/Module.test.cc
index 47795da47..2cf6334d2 100644
--- a/PPI/Module.test.cc
+++ b/PPI/Module.test.cc
@@ -30,7 +30,7 @@
 #include "Setup.hh"
 #include "Module.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 #include <boost/type_traits.hpp>
 
diff --git a/PPI/ModuleManager.test.cc b/PPI/ModuleManager.test.cc
index 0693b0cab..ec8ac9070 100644
--- a/PPI/ModuleManager.test.cc
+++ b/PPI/ModuleManager.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "ModuleManager.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/PassiveQueue.test.cc b/PPI/PassiveQueue.test.cc
index d1b255067..2fe3b9c14 100644
--- a/PPI/PassiveQueue.test.cc
+++ b/PPI/PassiveQueue.test.cc
@@ -32,7 +32,7 @@
 #include "Setup.hh"
 #include "../Packets/Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Queueing.test.cc b/PPI/Queueing.test.cc
index 7e05f4e60..1b9c960e2 100644
--- a/PPI/Queueing.test.cc
+++ b/PPI/Queueing.test.cc
@@ -34,7 +34,7 @@
 #include "../Packets/Packets.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Route.test.cc b/PPI/Route.test.cc
index 08e512575..3b6f12cc7 100644
--- a/PPI/Route.test.cc
+++ b/PPI/Route.test.cc
@@ -33,7 +33,7 @@
 #include "Module.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Setup.test.cc b/PPI/Setup.test.cc
index 7f0359a4b..08155999e 100644
--- a/PPI/Setup.test.cc
+++ b/PPI/Setup.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/SocketSink.test.cc b/PPI/SocketSink.test.cc
index d8c637c12..42e84c516 100644
--- a/PPI/SocketSink.test.cc
+++ b/PPI/SocketSink.test.cc
@@ -34,7 +34,7 @@
 #include "SocketSink.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/SocketSource.test.cc b/PPI/SocketSource.test.cc
index 21406260d..47cc426fe 100644
--- a/PPI/SocketSource.test.cc
+++ b/PPI/SocketSource.test.cc
@@ -34,7 +34,7 @@
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/ThrottleBarrier.test.cc b/PPI/ThrottleBarrier.test.cc
index 75ac4c3ac..7029463a1 100644
--- a/PPI/ThrottleBarrier.test.cc
+++ b/PPI/ThrottleBarrier.test.cc
@@ -31,7 +31,7 @@
 #include "DebugModules.hh"
 #include "../Packets/Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/main.test.cc b/PPI/main.test.cc
index 91e601da2..1d6a963c8 100644
--- a/PPI/main.test.cc
+++ b/PPI/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/DefaultBundle/EthernetPacket.test.cc b/Packets/DefaultBundle/EthernetPacket.test.cc
index 397f6f5f1..06e2acbde 100644
--- a/Packets/DefaultBundle/EthernetPacket.test.cc
+++ b/Packets/DefaultBundle/EthernetPacket.test.cc
@@ -29,7 +29,7 @@
 #include "EthernetPacket.hh"
 #include "IpV4Packet.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/DefaultBundle/IpV4Packet.test.cc b/Packets/DefaultBundle/IpV4Packet.test.cc
index eee06a11a..68fc7b09c 100644
--- a/Packets/DefaultBundle/IpV4Packet.test.cc
+++ b/Packets/DefaultBundle/IpV4Packet.test.cc
@@ -29,7 +29,7 @@
 #include "IpV4Packet.hh"
 #include "UDPPacket.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/DefaultBundle/IpV6Extensions.test.cc b/Packets/DefaultBundle/IpV6Extensions.test.cc
index bf79564bd..f74e893a6 100644
--- a/Packets/DefaultBundle/IpV6Extensions.test.cc
+++ b/Packets/DefaultBundle/IpV6Extensions.test.cc
@@ -30,7 +30,7 @@
 #include "UDPPacket.hh"
 #include "../../Socket/Protocols/INet/INetAddressing.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/DefaultBundle/IpV6Packet.test.cc b/Packets/DefaultBundle/IpV6Packet.test.cc
index d19e0500c..8838cc53d 100644
--- a/Packets/DefaultBundle/IpV6Packet.test.cc
+++ b/Packets/DefaultBundle/IpV6Packet.test.cc
@@ -29,7 +29,7 @@
 #include "../../Socket/Protocols/INet/INetAddressing.hh"
 #include "../../Packets/DataPacket.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/DefaultBundle/UDPPacket.test.cc b/Packets/DefaultBundle/UDPPacket.test.cc
index d9d84c300..744c439d3 100644
--- a/Packets/DefaultBundle/UDPPacket.test.cc
+++ b/Packets/DefaultBundle/UDPPacket.test.cc
@@ -29,7 +29,7 @@
 #include "UDPPacket.hh"
 #include "IpV4Packet.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/DefaultBundle/main.test.cc b/Packets/DefaultBundle/main.test.cc
index 7607fdcbc..62f13a9c0 100644
--- a/Packets/DefaultBundle/main.test.cc
+++ b/Packets/DefaultBundle/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/MPEGDVBBundle/TLVPacket.test.cc b/Packets/MPEGDVBBundle/TLVPacket.test.cc
index eee6c809d..0e3889d5a 100644
--- a/Packets/MPEGDVBBundle/TLVPacket.test.cc
+++ b/Packets/MPEGDVBBundle/TLVPacket.test.cc
@@ -29,7 +29,7 @@
 #include "TLVPacket.hh"
 #include <senf/Packets.hh>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/MPEGDVBBundle/TransportPacket.test.cc b/Packets/MPEGDVBBundle/TransportPacket.test.cc
index e2e09efff..6c4e5d2ae 100644
--- a/Packets/MPEGDVBBundle/TransportPacket.test.cc
+++ b/Packets/MPEGDVBBundle/TransportPacket.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "TransportPacket.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/MPEGDVBBundle/main.test.cc b/Packets/MPEGDVBBundle/main.test.cc
index c784c25f4..f7e93d970 100644
--- a/Packets/MPEGDVBBundle/main.test.cc
+++ b/Packets/MPEGDVBBundle/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/Packet.test.cc b/Packets/Packet.test.cc
index baa89f0ac..8da1546ca 100644
--- a/Packets/Packet.test.cc
+++ b/Packets/Packet.test.cc
@@ -28,7 +28,7 @@
 #include <sstream>
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/PacketData.test.cc b/Packets/PacketData.test.cc
index 91c544724..adab115dc 100644
--- a/Packets/PacketData.test.cc
+++ b/Packets/PacketData.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/PacketImpl.test.cc b/Packets/PacketImpl.test.cc
index 8f6fe56f3..a38d6a5f2 100644
--- a/Packets/PacketImpl.test.cc
+++ b/Packets/PacketImpl.test.cc
@@ -28,7 +28,7 @@
 #include "Packets.hh"
 #include "main.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/PacketInterpreter.test.cc b/Packets/PacketInterpreter.test.cc
index 242869975..a83bb789d 100644
--- a/Packets/PacketInterpreter.test.cc
+++ b/Packets/PacketInterpreter.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/PacketParser.test.cc b/Packets/PacketParser.test.cc
index 8be052493..cfa0990c3 100644
--- a/Packets/PacketParser.test.cc
+++ b/Packets/PacketParser.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/PacketRegistry.test.cc b/Packets/PacketRegistry.test.cc
index 07523d93b..37b6750eb 100644
--- a/Packets/PacketRegistry.test.cc
+++ b/Packets/PacketRegistry.test.cc
@@ -29,7 +29,7 @@
 #include <string>
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseArray.test.cc b/Packets/ParseArray.test.cc
index 350d7d5a9..2d2160015 100644
--- a/Packets/ParseArray.test.cc
+++ b/Packets/ParseArray.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseHelpers.test.cc b/Packets/ParseHelpers.test.cc
index 3d42cff6d..1fa89cbc6 100644
--- a/Packets/ParseHelpers.test.cc
+++ b/Packets/ParseHelpers.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseInt.test.cc b/Packets/ParseInt.test.cc
index e240e377f..0f6f09593 100644
--- a/Packets/ParseInt.test.cc
+++ b/Packets/ParseInt.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseList.test.cc b/Packets/ParseList.test.cc
index 1145af6c6..e2830cc60 100644
--- a/Packets/ParseList.test.cc
+++ b/Packets/ParseList.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseListB.test.cc b/Packets/ParseListB.test.cc
index 764ab645f..a3d5fc1d2 100644
--- a/Packets/ParseListB.test.cc
+++ b/Packets/ParseListB.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseListN.test.cc b/Packets/ParseListN.test.cc
index 3800a0d90..1e8c56f79 100644
--- a/Packets/ParseListN.test.cc
+++ b/Packets/ParseListN.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseVariant.test.cc b/Packets/ParseVariant.test.cc
index d3bd24f9c..e795e49a9 100644
--- a/Packets/ParseVariant.test.cc
+++ b/Packets/ParseVariant.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseVec.test.cc b/Packets/ParseVec.test.cc
index 64e68e6e0..daa30d1ef 100644
--- a/Packets/ParseVec.test.cc
+++ b/Packets/ParseVec.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 #include <boost/assign.hpp>
 
diff --git a/Packets/main.test.cc b/Packets/main.test.cc
index c2972fdad..ec5fc376c 100644
--- a/Packets/main.test.cc
+++ b/Packets/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 #include "Packets.hh"
 
diff --git a/Scheduler/ClockService.test.cc b/Scheduler/ClockService.test.cc
index fbbe5ab11..1231e5d8f 100644
--- a/Scheduler/ClockService.test.cc
+++ b/Scheduler/ClockService.test.cc
@@ -30,7 +30,7 @@
 #include "ClockService.hh"
 #include <errno.h>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Scheduler/ReadHelper.test.cc b/Scheduler/ReadHelper.test.cc
index 79b071581..466b4fb2e 100644
--- a/Scheduler/ReadHelper.test.cc
+++ b/Scheduler/ReadHelper.test.cc
@@ -10,7 +10,7 @@
 // Custom includes
 #include "ReadHelper.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Scheduler/Scheduler.test.cc b/Scheduler/Scheduler.test.cc
index 5116a9c0f..f3f498edf 100644
--- a/Scheduler/Scheduler.test.cc
+++ b/Scheduler/Scheduler.test.cc
@@ -39,7 +39,7 @@
 
 #include "Scheduler.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Scheduler/WriteHelper.test.cc b/Scheduler/WriteHelper.test.cc
index ab4f479c2..b6b45277a 100644
--- a/Scheduler/WriteHelper.test.cc
+++ b/Scheduler/WriteHelper.test.cc
@@ -10,7 +10,7 @@
 // Custom includes
 #include "WriteHelper.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Scheduler/main.test.cc b/Scheduler/main.test.cc
index b759387fb..385b73026 100644
--- a/Scheduler/main.test.cc
+++ b/Scheduler/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/ClientSocketHandle.test.cc b/Socket/ClientSocketHandle.test.cc
index 37494d79a..01ddad2a1 100644
--- a/Socket/ClientSocketHandle.test.cc
+++ b/Socket/ClientSocketHandle.test.cc
@@ -31,7 +31,7 @@
 #include "ClientSocketHandle.hh"
 #include "AddressingPolicy.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/FileHandle.test.cc b/Socket/FileHandle.test.cc
index f4dac9dfb..014d07233 100644
--- a/Socket/FileHandle.test.cc
+++ b/Socket/FileHandle.test.cc
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include "FileHandle.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/ProtocolClientSocketHandle.test.cc b/Socket/ProtocolClientSocketHandle.test.cc
index ad37183b3..11e93a8fd 100644
--- a/Socket/ProtocolClientSocketHandle.test.cc
+++ b/Socket/ProtocolClientSocketHandle.test.cc
@@ -29,7 +29,7 @@
 #include "ProtocolClientSocketHandle.hh"
 #include "SocketProtocol.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/ProtocolServerSocketHandle.test.cc b/Socket/ProtocolServerSocketHandle.test.cc
index 424372979..4cda809ea 100644
--- a/Socket/ProtocolServerSocketHandle.test.cc
+++ b/Socket/ProtocolServerSocketHandle.test.cc
@@ -29,7 +29,7 @@
 #include "ProtocolServerSocketHandle.hh"
 #include "SocketProtocol.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/DVB/main.test.cc b/Socket/Protocols/DVB/main.test.cc
index 91e601da2..8c0780c0c 100644
--- a/Socket/Protocols/DVB/main.test.cc
+++ b/Socket/Protocols/DVB/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/INet/INet4Address.test.cc b/Socket/Protocols/INet/INet4Address.test.cc
index aaf58f8e9..3dc83ae16 100644
--- a/Socket/Protocols/INet/INet4Address.test.cc
+++ b/Socket/Protocols/INet/INet4Address.test.cc
@@ -32,7 +32,7 @@
 #include <sstream>
 #include "INet4Address.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/INet/INet6Address.test.cc b/Socket/Protocols/INet/INet6Address.test.cc
index 2fae5a016..658b4658f 100644
--- a/Socket/Protocols/INet/INet6Address.test.cc
+++ b/Socket/Protocols/INet/INet6Address.test.cc
@@ -30,7 +30,7 @@
 #include <boost/lexical_cast.hpp>
 #include "INet6Address.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/INet/INetAddressing.test.cc b/Socket/Protocols/INet/INetAddressing.test.cc
index c4d392f61..52f94aacd 100644
--- a/Socket/Protocols/INet/INetAddressing.test.cc
+++ b/Socket/Protocols/INet/INetAddressing.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "INetAddressing.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/INet/TCPSocketHandle.test.cc b/Socket/Protocols/INet/TCPSocketHandle.test.cc
index 6a120ee28..3b4d0494f 100644
--- a/Socket/Protocols/INet/TCPSocketHandle.test.cc
+++ b/Socket/Protocols/INet/TCPSocketHandle.test.cc
@@ -35,7 +35,7 @@
 #include "TCPSocketHandle.hh"
 #include <iostream>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/INet/UDPSocketHandle.test.cc b/Socket/Protocols/INet/UDPSocketHandle.test.cc
index 939763b0d..b309e4355 100644
--- a/Socket/Protocols/INet/UDPSocketHandle.test.cc
+++ b/Socket/Protocols/INet/UDPSocketHandle.test.cc
@@ -36,7 +36,7 @@
 #include "UDPSocketHandle.hh"
 #include <iostream>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/INet/main.test.cc b/Socket/Protocols/INet/main.test.cc
index 91e601da2..8c0780c0c 100644
--- a/Socket/Protocols/INet/main.test.cc
+++ b/Socket/Protocols/INet/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/Raw/LLAddressing.test.cc b/Socket/Protocols/Raw/LLAddressing.test.cc
index 1d9f570de..87b02d2af 100644
--- a/Socket/Protocols/Raw/LLAddressing.test.cc
+++ b/Socket/Protocols/Raw/LLAddressing.test.cc
@@ -29,7 +29,7 @@
 #include <boost/lexical_cast.hpp>
 #include "LLAddressing.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/Raw/MACAddress.test.cc b/Socket/Protocols/Raw/MACAddress.test.cc
index 86dfa3e24..f33f1b930 100644
--- a/Socket/Protocols/Raw/MACAddress.test.cc
+++ b/Socket/Protocols/Raw/MACAddress.test.cc
@@ -29,7 +29,7 @@
 #include <boost/lexical_cast.hpp>
 #include "MACAddress.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/Raw/PacketSocketHandle.test.cc b/Socket/Protocols/Raw/PacketSocketHandle.test.cc
index 79dbde023..6241013fc 100644
--- a/Socket/Protocols/Raw/PacketSocketHandle.test.cc
+++ b/Socket/Protocols/Raw/PacketSocketHandle.test.cc
@@ -31,7 +31,7 @@
 #include <iostream>
 #include <unistd.h>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/Raw/main.test.cc b/Socket/Protocols/Raw/main.test.cc
index 91e601da2..8c0780c0c 100644
--- a/Socket/Protocols/Raw/main.test.cc
+++ b/Socket/Protocols/Raw/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/UN/UNAddress.test.cc b/Socket/Protocols/UN/UNAddress.test.cc
index 715afda39..af64685c0 100644
--- a/Socket/Protocols/UN/UNAddress.test.cc
+++ b/Socket/Protocols/UN/UNAddress.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "UNAddress.hh"
 #include <boost/filesystem/path.hpp>
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #include <iostream>
diff --git a/Socket/Protocols/UN/UNAddressing.test.cc b/Socket/Protocols/UN/UNAddressing.test.cc
index ebab854ac..7bd8e7fda 100644
--- a/Socket/Protocols/UN/UNAddressing.test.cc
+++ b/Socket/Protocols/UN/UNAddressing.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "UNAddressing.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #include <sys/socket.h>
diff --git a/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc b/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc
index 83827e3d6..69e743e1a 100644
--- a/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc
+++ b/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "UNDatagramSocketHandle.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/UN/UNProtocol.test.cc b/Socket/Protocols/UN/UNProtocol.test.cc
index 3d7e8dc80..a2ceb76bc 100644
--- a/Socket/Protocols/UN/UNProtocol.test.cc
+++ b/Socket/Protocols/UN/UNProtocol.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "UNProtocol.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/UN/main.test.cc b/Socket/Protocols/UN/main.test.cc
index 91e601da2..8c0780c0c 100644
--- a/Socket/Protocols/UN/main.test.cc
+++ b/Socket/Protocols/UN/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/main.test.cc b/Socket/Protocols/main.test.cc
index 91e601da2..be0cdde8f 100644
--- a/Socket/Protocols/main.test.cc
+++ b/Socket/Protocols/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/ServerSocketHandle.test.cc b/Socket/ServerSocketHandle.test.cc
index 649585610..5f9230e0f 100644
--- a/Socket/ServerSocketHandle.test.cc
+++ b/Socket/ServerSocketHandle.test.cc
@@ -31,7 +31,7 @@
 #include "SocketProtocol.test.hh"
 #include "AddressingPolicy.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/SocketHandle.test.cc b/Socket/SocketHandle.test.cc
index f2e31a718..10336be7c 100644
--- a/Socket/SocketHandle.test.cc
+++ b/Socket/SocketHandle.test.cc
@@ -30,7 +30,7 @@
 #include "SocketProtocol.test.hh"
 #include "AddressingPolicy.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/SocketPolicy.test.cc b/Socket/SocketPolicy.test.cc
index 84a830cbd..4729bcada 100644
--- a/Socket/SocketPolicy.test.cc
+++ b/Socket/SocketPolicy.test.cc
@@ -29,7 +29,7 @@
 #include "SocketPolicy.hh"
 #include "SocketPolicy.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/concept_check.hpp>
diff --git a/Socket/SocketProtocol.test.cc b/Socket/SocketProtocol.test.cc
index 2168488f2..ea1c412be 100644
--- a/Socket/SocketProtocol.test.cc
+++ b/Socket/SocketProtocol.test.cc
@@ -30,7 +30,7 @@
 #include "SocketPolicy.hh"
 #include "SocketProtocol.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/main.test.cc b/Socket/main.test.cc
index b759387fb..385b73026 100644
--- a/Socket/main.test.cc
+++ b/Socket/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Buffer.test.cc b/Utils/Buffer.test.cc
index a5d9d4ed8..ff205cf15 100644
--- a/Utils/Buffer.test.cc
+++ b/Utils/Buffer.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Buffer.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Exception.test.cc b/Utils/Exception.test.cc
index 7421921aa..314cc41ea 100644
--- a/Utils/Exception.test.cc
+++ b/Utils/Exception.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Exception.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/IpChecksum.test.cc b/Utils/IpChecksum.test.cc
index 24319d04d..54642b269 100644
--- a/Utils/IpChecksum.test.cc
+++ b/Utils/IpChecksum.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "IpChecksum.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/IteratorTraits.test.cc b/Utils/IteratorTraits.test.cc
index d874e2294..4a27dccfa 100644
--- a/Utils/IteratorTraits.test.cc
+++ b/Utils/IteratorTraits.test.cc
@@ -31,7 +31,7 @@
 #include <vector>
 #include <string>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/AreaRegistry.test.cc b/Utils/Logger/AreaRegistry.test.cc
index a299cf3b5..f45109800 100644
--- a/Utils/Logger/AreaRegistry.test.cc
+++ b/Utils/Logger/AreaRegistry.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "main.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/Config.test.cc b/Utils/Logger/Config.test.cc
index 5371e6645..6a2be182a 100644
--- a/Utils/Logger/Config.test.cc
+++ b/Utils/Logger/Config.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "main.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/Log.test.cc b/Utils/Logger/Log.test.cc
index a79397a6c..0d38bc23c 100644
--- a/Utils/Logger/Log.test.cc
+++ b/Utils/Logger/Log.test.cc
@@ -27,7 +27,7 @@
 //#include "Log.test.ih"
 
 // Custom includes
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 #include "main.test.hh"
 
diff --git a/Utils/Logger/Parameters.test.cc b/Utils/Logger/Parameters.test.cc
index ed2d8c6de..a22c1cec1 100644
--- a/Utils/Logger/Parameters.test.cc
+++ b/Utils/Logger/Parameters.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "main.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/StreamRegistry.test.cc b/Utils/Logger/StreamRegistry.test.cc
index 21901a067..a5c682403 100644
--- a/Utils/Logger/StreamRegistry.test.cc
+++ b/Utils/Logger/StreamRegistry.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "main.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/Target.test.cc b/Utils/Logger/Target.test.cc
index b41ead9f6..270852cf9 100644
--- a/Utils/Logger/Target.test.cc
+++ b/Utils/Logger/Target.test.cc
@@ -30,7 +30,7 @@
 #include <sstream>
 #include "main.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/main.test.cc b/Utils/Logger/main.test.cc
index 2e4e3879e..d3f3be2fd 100644
--- a/Utils/Logger/main.test.cc
+++ b/Utils/Logger/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/SafeBool.test.cc b/Utils/SafeBool.test.cc
index 39a95bef5..88dd748db 100644
--- a/Utils/SafeBool.test.cc
+++ b/Utils/SafeBool.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "SafeBool.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/TypeIdValue.test.cc b/Utils/TypeIdValue.test.cc
index 12b9251c9..39cf7d4c0 100644
--- a/Utils/TypeIdValue.test.cc
+++ b/Utils/TypeIdValue.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "TypeIdValue.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/TypeInfo.test.cc b/Utils/TypeInfo.test.cc
index a8e7312e2..ac6c5f99e 100644
--- a/Utils/TypeInfo.test.cc
+++ b/Utils/TypeInfo.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "TypeInfo.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/auto_unit_test.hh b/Utils/auto_unit_test.hh
new file mode 100644
index 000000000..beb770f20
--- /dev/null
+++ b/Utils/auto_unit_test.hh
@@ -0,0 +1,58 @@
+// $Id$
+//
+// Copyright (C) 2007 
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum fuer NETwork research (NET)
+//     Stefan Bund <g0dil@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+/** \file
+    \brief auto_unit_test public header */
+
+#ifndef HH_auto_unit_test_
+#define HH_auto_unit_test_ 1
+
+// Custom includes
+#include <boost/version.hpp>
+
+//#include "auto_unit_test.mpp"
+///////////////////////////////hh.p////////////////////////////////////////
+
+#if BOOST_VERSION >= 103400
+
+#   define BOOST_AUTO_UNIT_TEST BOOST_AUTO_TEST_CASE
+
+#endif
+
+#include <boost/test/auto_unit_test.hpp>
+
+///////////////////////////////hh.e////////////////////////////////////////
+//#include "auto_unit_test.cci"
+//#include "auto_unit_test.ct"
+//#include "auto_unit_test.cti"
+#endif
+
+
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
diff --git a/Utils/hexdump.test.cc b/Utils/hexdump.test.cc
index ac64f5fc0..caf5a3512 100644
--- a/Utils/hexdump.test.cc
+++ b/Utils/hexdump.test.cc
@@ -30,7 +30,7 @@
 #include "hexdump.hh"
 #include <sstream>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/intrusive_refcount.test.cc b/Utils/intrusive_refcount.test.cc
index ca05e1843..07ad3940e 100644
--- a/Utils/intrusive_refcount.test.cc
+++ b/Utils/intrusive_refcount.test.cc
@@ -29,7 +29,7 @@
 #include "intrusive_refcount.hh"
 #include <boost/intrusive_ptr.hpp>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/main.test.cc b/Utils/main.test.cc
index b759387fb..385b73026 100644
--- a/Utils/main.test.cc
+++ b/Utils/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/membind.test.cc b/Utils/membind.test.cc
index 3cfbb87d9..98ddb17a3 100644
--- a/Utils/membind.test.cc
+++ b/Utils/membind.test.cc
@@ -30,7 +30,7 @@
 #include <string>
 #include "../Utils/membind.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/mpl.test.cc b/Utils/mpl.test.cc
index 5e6965812..9e80f68a3 100644
--- a/Utils/mpl.test.cc
+++ b/Utils/mpl.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "mpl.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/pool_alloc_mixin.test.cc b/Utils/pool_alloc_mixin.test.cc
index 2fb61071c..e91ac4ab9 100644
--- a/Utils/pool_alloc_mixin.test.cc
+++ b/Utils/pool_alloc_mixin.test.cc
@@ -30,7 +30,7 @@
 #include "pool_alloc_mixin.hh"
 #include <boost/scoped_ptr.hpp>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/singleton.test.cc b/Utils/singleton.test.cc
index fb134af00..24560c27d 100644
--- a/Utils/singleton.test.cc
+++ b/Utils/singleton.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "singleton.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-- 
GitLab