Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ApplicationCore
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ChimeraTK Mirror
ApplicationCore
Commits
b8b0dd6e
Commit
b8b0dd6e
authored
2 years ago
by
Jens Georg
Committed by
Martin Christoph Hierholzer
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix testConfigReader
Move the config module to the proper level for matching up with the device
parent
e02f00a3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/executables_src/testConfigReader.cc
+5
-4
5 additions, 4 deletions
tests/executables_src/testConfigReader.cc
with
5 additions
and
4 deletions
tests/executables_src/testConfigReader.cc
+
5
−
4
View file @
b8b0dd6e
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment