[icinga-checkins] icinga.org: icinga2/master: Fix livestatus unit tests on Linux/Windows

git at icinga.org git at icinga.org
Sun Aug 28 15:15:10 CEST 2016


Module: icinga2
Branch: master
Commit: 20174a0baabb27d63c11c1899ee6aa477b432310
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=20174a0baabb27d63c11c1899ee6aa477b432310

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Sun Aug 28 15:14:49 2016 +0200

Fix livestatus unit tests on Linux/Windows

refs #8806

---

 test/CMakeLists.txt      |    2 +-
 test/livestatus-test.cpp |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7ad2542..e895b0e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -120,7 +120,7 @@ if(ICINGA2_WITH_LIVESTATUS)
 
   add_boost_test(livestatus
     SOURCES livestatus-test.cpp ${livestatus_test_SOURCES}
-    LIBRARIES base config icinga methods livestatus
+    LIBRARIES base config icinga livestatus
     DEPENDENCIES methods
     TESTS livestatus/hosts livestatus/services
   )
diff --git a/test/livestatus-test.cpp b/test/livestatus-test.cpp
index 18aa932..37ff491 100644
--- a/test/livestatus-test.cpp
+++ b/test/livestatus-test.cpp
@@ -52,6 +52,8 @@ struct LivestatusFixture
 	static void CreateTestObjects(void)
 	{
 		String config = R"CONFIG(
+library "methods"
+
 object CheckCommand "dummy" {
   command = "/bin/echo"
 }



More information about the icinga-checkins mailing list