Skip to content
Snippets Groups Projects
Commit b8b0dd6e authored by Jens Georg's avatar Jens Georg Committed by Martin Christoph Hierholzer
Browse files

Fix testConfigReader

Move the config module to the proper level for matching up with the
device
parent e02f00a3
No related branches found
No related tags found
No related merge requests found
......@@ -153,7 +153,7 @@ struct TestApplication : public ctk::Application {
~TestApplication() { shutdown(); }
ctk::ConfigReader config{this, "config", "validConfig.xml", {"MyTAG"}};
TestModule testModule{this, "TestModule", "The test module"};
TestModule testModule{this, "config", "The test module"};
};
/*********************************************************************************************************************/
......@@ -185,7 +185,7 @@ struct TestApplicationWithDevice : public ctk::Application {
TestApplicationWithDevice() : Application("TestApplicationWithDevice") {}
~TestApplicationWithDevice() { shutdown(); }
ctk::ConfigReader config{this, "config", "validConfig.xml", {"MyTAG"}};
ctk::ConfigReader config{this, ".", "validConfig.xml", {"MyTAG"}};
ctk::DeviceModule device{this, cdd};
};
......@@ -239,8 +239,9 @@ BOOST_AUTO_TEST_CASE(testConfigReader) {
// app.config.virtualise().dump();
// app.config.connectTo(app.testModule);
app.initialise();
app.run();
// Cheap way to get a PV manager
ctk::TestFacility tf{app, false};
tf.runApplication();
// wait until tests in TestModule::mainLoop() are complete
while(app.testModule.done == false) usleep(10000);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment