From e87ace65ef691597de3698461deccb4147b4b5b9 Mon Sep 17 00:00:00 2001
From: Horst Schirmeier <horst.schirmeier@tu-dortmund.de>
Date: Fri, 29 Aug 2014 11:35:45 +0200
Subject: [PATCH] util: SumTree test build fix

This fixes a "funny" conflict between the SumTreeTest and
weather-monitor's experiment.hpp.

Note to self: Preprocessor macros are evil.

Change-Id: I3f8c95fe086357db77110c0c53d3120ca839f30a
---
 src/core/util/CMakeLists.txt         | 1 +
 src/core/util/testing/SumTreeTest.cc | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/util/CMakeLists.txt b/src/core/util/CMakeLists.txt
index b8cd483d..1b03c610 100644
--- a/src/core/util/CMakeLists.txt
+++ b/src/core/util/CMakeLists.txt
@@ -91,4 +91,5 @@ target_link_libraries(memorymap-test fail-util)
 add_test(NAME memorymap-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/testing COMMAND memorymap-test)
 
 add_executable(sumtree-test testing/SumTreeTest.cc)
+target_link_libraries(sumtree-test fail-util)
 add_test(NAME sumtree-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/testing COMMAND sumtree-test)
diff --git a/src/core/util/testing/SumTreeTest.cc b/src/core/util/testing/SumTreeTest.cc
index 1757cd17..61153435 100644
--- a/src/core/util/testing/SumTreeTest.cc
+++ b/src/core/util/testing/SumTreeTest.cc
@@ -1,10 +1,12 @@
 #include "util/SumTree.hpp"
+#include "util/Logger.hpp"
 
 #include <iostream>
-#define LOG std::cerr
 
 using std::endl;
 
+fail::Logger LOG("SumTreeTest");
+
 struct Pilot {
 	uint32_t id;
 	uint32_t instr2;