Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
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
Code review analytics
Issue 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
Anders Lindh Olsson
e3-require
Commits
44414dc5
Commit
44414dc5
authored
3 years ago
by
Simon Rose
Browse files
Options
Downloads
Patches
Plain Diff
Moved get_env_var over to the wrapper as well
parent
85af4d46
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/test_build.py
+2
-2
2 additions, 2 deletions
tests/test_build.py
tests/utils.py
+0
-13
0 additions, 13 deletions
tests/utils.py
with
2 additions
and
15 deletions
tests/test_build.py
+
2
−
2
View file @
44414dc5
import
re
from
pathlib
import
Path
from
.utils
import
get_env_var
,
run_ioc_get_output
from
.utils
import
run_ioc_get_output
MODULE_VERSION
=
"
0.0.0+0
"
MODULE_VERSION_NO_BUILD
=
"
0.0.0
"
...
...
@@ -110,7 +110,7 @@ def test_header_install_location(wrapper):
rc
,
*
_
=
wrapper
.
run_make
(
"
cellinstall
"
)
assert
rc
==
0
cell_path
=
get_env_var
(
wrapper
,
"
E3_MODULES_INSTALL_LOCATION
"
)
cell_path
=
wrapper
.
get_env_var
(
"
E3_MODULES_INSTALL_LOCATION
"
)
for
ext
in
extensions
:
assert
(
Path
(
cell_path
)
/
"
include
"
/
"
subdir
"
/
f
"
header.
{
ext
}
"
).
is_file
()
...
...
This diff is collapsed.
Click to expand it.
tests/utils.py
+
0
−
13
View file @
44414dc5
...
...
@@ -2,19 +2,6 @@ import time
from
run_iocsh
import
IOC
from
.conftest
import
Wrapper
def
get_env_var
(
wrapper
:
Wrapper
,
var
:
str
):
"""
Fetch an environment variable from the module build environment
"""
_
,
out
,
_
=
wrapper
.
run_make
(
"
cellvars
"
)
for
line
in
out
.
split
(
"
\n
"
):
if
line
.
startswith
(
var
):
return
line
.
split
(
"
=
"
)[
1
].
strip
()
return
""
def
run_ioc_get_output
(
module
,
version
,
cell_path
):
"""
...
...
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