Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dorie
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
31
Issues
31
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
dorie
dorie
Commits
d748a731
Commit
d748a731
authored
Oct 23, 2016
by
Dion Haefner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure testtools wrapper to find dorie executable
parent
f702d210
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
25 additions
and
6 deletions
+25
-6
.gitignore
.gitignore
+2
-0
python/CMakeLists.txt
python/CMakeLists.txt
+1
-0
python/testtools/dorie/testtools/wrapper/test_dorie.py
python/testtools/dorie/testtools/wrapper/test_dorie.py
+2
-2
python/testtools/dorie/testtools/wrapper/test_dorie_pfg.py
python/testtools/dorie/testtools/wrapper/test_dorie_pfg.py
+2
-2
python/testtools/wrapper/CMakeLists.txt
python/testtools/wrapper/CMakeLists.txt
+2
-0
python/testtools/wrapper/test_dorie.py.in
python/testtools/wrapper/test_dorie.py.in
+8
-1
python/testtools/wrapper/test_dorie_pfg.py.in
python/testtools/wrapper/test_dorie_pfg.py.in
+8
-1
No files found.
.gitignore
View file @
d748a731
...
...
@@ -4,6 +4,8 @@ build-cmake/
# Exclude generated files
testing/*.mini
python/parfield/wrapper/pf_from_file.py
python/testtools/wrapper/test_dorie.py
python/testtools/wrapper/test_dorie_pfg.py
# Ignore temporary and auto-generated files #
*~
...
...
python/CMakeLists.txt
View file @
d748a731
...
...
@@ -11,6 +11,7 @@ install_python_package("parscraper" python_paths)
add_subdirectory
(
parfield/wrapper
)
install_python_package
(
"parfield"
python_paths
)
if
(
dune-testtools_FOUND
)
add_subdirectory
(
testtools/wrapper
)
install_python_package
(
"testtools"
python_paths
)
endif
()
...
...
python/testtools/dorie/testtools/wrapper/test_dorie.py
View file @
d748a731
...
...
@@ -7,11 +7,11 @@ import time
import
dorie.testtools.dorie
as
evaluation
def
test_dorie
(
iniinfo
,
inifile
):
def
test_dorie
(
iniinfo
,
inifile
,
executable
):
"""
Parses the parameter file, calls DORiE, calls the evaluation routines and exits with 0 (pass) or 1 (fail)
"""
command
=
[
"dorie"
]
command
=
[
executable
]
if
"__inifile_optionkey"
in
iniinfo
:
command
.
append
(
iniinfo
[
"__inifile_optionkey"
])
command
.
append
(
inifile
)
...
...
python/testtools/dorie/testtools/wrapper/test_dorie_pfg.py
View file @
d748a731
...
...
@@ -7,11 +7,11 @@ import time
import
dorie.testtools.dorie_pfg
as
evaluation
def
test_dorie_pfg
(
iniinfo
,
inifile
):
def
test_dorie_pfg
(
iniinfo
,
inifile
,
executable
):
"""
Parses the parameter file, calls DORiE, calls the evaluation routines and exits with 0 (pass) or 1 (fail)
"""
command
=
[
"dorie"
]
command
=
[
executable
]
if
"__inifile_optionkey"
in
iniinfo
:
command
.
append
(
iniinfo
[
"__inifile_optionkey"
])
command
.
append
(
inifile
)
...
...
python/testtools/wrapper/CMakeLists.txt
0 → 100644
View file @
d748a731
configure_file
(
test_dorie.py.in
${
CMAKE_CURRENT_SOURCE_DIR
}
/test_dorie.py
)
configure_file
(
test_dorie_pfg.py.in
${
CMAKE_CURRENT_SOURCE_DIR
}
/test_dorie_pfg.py
)
python/testtools/wrapper/test_dorie.py
→
python/testtools/wrapper/test_dorie.py
.in
View file @
d748a731
...
...
@@ -2,13 +2,20 @@
from
__future__
import
absolute_import
import
sys
import
os
from
dune.testtools.wrapper.argumentparser
import
get_args
from
dune.testtools.parser
import
parse_ini_file
from
dorie.testtools.wrapper
import
test_dorie
# paths set by cmake
DORIEDIR
=
"@CMAKE_BINARY_DIR@"
#
DORIE_WRAPPER
=
os
.
path
.
join
(
DORIEDIR
,
"bin/dorie"
)
if
__name__
==
"__main__"
:
args
=
get_args
()
iniargument
=
args
[
"ini"
]
iniinfo
=
parse_ini_file
(
args
[
"ini"
])
sys
.
exit
(
test_dorie
.
test_dorie
(
iniinfo
,
iniargument
))
sys
.
exit
(
test_dorie
.
test_dorie
(
iniinfo
,
iniargument
,
DORIE_WRAPPER
))
python/testtools/wrapper/test_dorie_pfg.py
→
python/testtools/wrapper/test_dorie_pfg.py
.in
View file @
d748a731
...
...
@@ -2,13 +2,20 @@
from
__future__
import
absolute_import
import
sys
import
os
from
dune.testtools.wrapper.argumentparser
import
get_args
from
dune.testtools.parser
import
parse_ini_file
from
dorie.testtools.wrapper
import
test_dorie_pfg
# paths set by cmake
DORIEDIR
=
"@CMAKE_BINARY_DIR@"
#
DORIE_WRAPPER
=
os
.
path
.
join
(
DORIEDIR
,
"bin/dorie"
)
if
__name__
==
"__main__"
:
args
=
get_args
()
iniargument
=
args
[
"ini"
]
iniinfo
=
parse_ini_file
(
args
[
"ini"
])
sys
.
exit
(
test_dorie_pfg
.
test_dorie_pfg
(
iniinfo
,
iniargument
))
sys
.
exit
(
test_dorie_pfg
.
test_dorie_pfg
(
iniinfo
,
iniargument
,
DORIE_WRAPPER
))
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment