From 3adfd396f4170ed77ead6a2791255850f3cd3838 Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Fri, 23 Mar 2018 13:31:34 +0100 Subject: [PATCH] tests: Ensure IcingaApplication is initialized before adding config This avoids an ordering problem noticed in Boost 1.55 --- test/livestatus-fixture.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/livestatus-fixture.cpp b/test/livestatus-fixture.cpp index 8007b159a..c016ffe95 100644 --- a/test/livestatus-fixture.cpp +++ b/test/livestatus-fixture.cpp @@ -21,6 +21,7 @@ #include "config/configitem.hpp" #include "base/application.hpp" #include "base/loader.hpp" +#include "icingaapplication-fixture.hpp" #include using namespace icinga; @@ -29,6 +30,9 @@ struct LivestatusFixture { LivestatusFixture() { + // ensure IcingaApplication is initialized before we try to add config + IcingaApplicationFixture icinga; + BOOST_TEST_MESSAGE("Preparing config objects..."); ConfigItem::RunWithActivationContext(new Function("CreateTestObjects", CreateTestObjects)); -- 2.40.0