Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Nektar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Dappur
Nektar
Commits
458d7d2a
Commit
458d7d2a
authored
7 years ago
by
Kilian Lackhove
Browse files
Options
Downloads
Patches
Plain Diff
Tester: added command override
parent
b0aa7a11
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
tests/TestData.cpp
+15
-0
15 additions, 0 deletions
tests/TestData.cpp
tests/TestData.h
+2
-0
2 additions, 0 deletions
tests/TestData.h
tests/Tester.cpp.in
+6
-0
6 additions, 0 deletions
tests/Tester.cpp.in
with
23 additions
and
0 deletions
tests/TestData.cpp
+
15
−
0
View file @
458d7d2a
...
...
@@ -82,6 +82,11 @@ namespace Nektar
return
m_parameters
;
}
const
std
::
string
&
TestData
::
GetCommand
()
const
{
return
m_command
;
}
const
unsigned
int
&
TestData
::
GetNProcesses
()
const
{
return
m_processes
;
...
...
@@ -166,6 +171,16 @@ namespace Nektar
m_parameters
=
string
(
tmp
->
GetText
());
}
tmp
=
testElement
->
FirstChildElement
(
"command"
);
if
(
tmp
)
{
m_command
=
string
(
tmp
->
GetText
());
}
else
{
m_command
=
""
;
}
// Find parallel processes tah.
tmp
=
testElement
->
FirstChildElement
(
"processes"
);
if
(
tmp
)
...
...
This diff is collapsed.
Click to expand it.
tests/TestData.h
+
2
−
0
View file @
458d7d2a
...
...
@@ -64,6 +64,7 @@ namespace Nektar
const
std
::
string
&
GetDescription
()
const
;
const
fs
::
path
&
GetExecutable
()
const
;
const
std
::
string
&
GetParameters
()
const
;
const
std
::
string
&
GetCommand
()
const
;
const
unsigned
int
&
GetNProcesses
()
const
;
std
::
string
GetMetricType
(
unsigned
int
pId
)
const
;
...
...
@@ -81,6 +82,7 @@ namespace Nektar
std
::
string
m_description
;
fs
::
path
m_executable
;
std
::
string
m_parameters
;
std
::
string
m_command
;
unsigned
int
m_processes
;
TiXmlDocument
*
m_doc
;
std
::
vector
<
TiXmlElement
*>
m_metrics
;
...
...
This diff is collapsed.
Click to expand it.
tests/Tester.cpp.in
+
6
−
0
View file @
458d7d2a
...
...
@@ -236,6 +236,12 @@ int main(int argc, char *argv[])
command += file.GetParameters();
command += " 1>output.out 2>output.err";
// override command if specified
if (file.GetCommand() != "")
{
command = file.GetCommand();
}
status = 0;
string line;
...
...
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