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
Iterations
Wiki
Jira
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
ESS EPICS Environment
wrappers
e3-require
Commits
04e21083
Commit
04e21083
authored
3 years ago
by
Simon Rose
Browse files
Options
Downloads
Patches
Plain Diff
Renamed add_to_makefile to improve clarity
parent
b09f395a
No related branches found
No related tags found
1 merge request
!73
E3-286: module dep file recreation
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/conftest.py
+1
-2
1 addition, 2 deletions
tests/conftest.py
tests/test_build.py
+8
-8
8 additions, 8 deletions
tests/test_build.py
with
9 additions
and
10 deletions
tests/conftest.py
+
1
−
2
View file @
04e21083
...
@@ -50,8 +50,7 @@ include $(E3_REQUIRE_TOOLS)/driver.makefile
...
@@ -50,8 +50,7 @@ include $(E3_REQUIRE_TOOLS)/driver.makefile
def
add_file
(
self
,
name
):
def
add_file
(
self
,
name
):
(
self
.
module_dir
/
name
).
touch
()
(
self
.
module_dir
/
name
).
touch
()
def
add_to_makefile
(
self
,
makefile_var
,
value
,
modifier
=
"
+
"
):
def
add_var_to_makefile
(
self
,
makefile_var
,
value
,
modifier
=
"
+
"
):
assert
modifier
in
[
""
,
"
+
"
,
"
?
"
,
"
:
"
,
"
!
"
]
with
open
(
self
.
makefile
,
"
a
"
)
as
f
:
with
open
(
self
.
makefile
,
"
a
"
)
as
f
:
f
.
write
(
f
"
{
makefile_var
}
{
modifier
}
=
{
value
}
\n
"
)
f
.
write
(
f
"
{
makefile_var
}
{
modifier
}
=
{
value
}
\n
"
)
...
...
This diff is collapsed.
Click to expand it.
tests/test_build.py
+
8
−
8
View file @
04e21083
...
@@ -67,7 +67,7 @@ def test_patch(wrapper):
...
@@ -67,7 +67,7 @@ def test_patch(wrapper):
def
test_missing_dbd_file
(
wrapper
):
def
test_missing_dbd_file
(
wrapper
):
wrapper
.
add_to_makefile
(
"
DBDS
"
,
"
nonexistent.dbd
"
)
wrapper
.
add_
var_
to_makefile
(
"
DBDS
"
,
"
nonexistent.dbd
"
)
rc
,
_
,
errs
=
run_make
(
wrapper
,
"
build
"
)
rc
,
_
,
errs
=
run_make
(
wrapper
,
"
build
"
)
assert
rc
==
2
assert
rc
==
2
...
@@ -78,7 +78,7 @@ def test_missing_dbd_file(wrapper):
...
@@ -78,7 +78,7 @@ def test_missing_dbd_file(wrapper):
def
test_missing_source_file
(
wrapper
):
def
test_missing_source_file
(
wrapper
):
wrapper
.
add_to_makefile
(
"
SOURCES
"
,
"
nonexistent.c
"
)
wrapper
.
add_
var_
to_makefile
(
"
SOURCES
"
,
"
nonexistent.c
"
)
rc
,
_
,
errs
=
run_make
(
wrapper
,
"
build
"
)
rc
,
_
,
errs
=
run_make
(
wrapper
,
"
build
"
)
assert
rc
==
2
assert
rc
==
2
...
@@ -89,7 +89,7 @@ def test_missing_source_file(wrapper):
...
@@ -89,7 +89,7 @@ def test_missing_source_file(wrapper):
def
test_missing_requirement
(
wrapper
):
def
test_missing_requirement
(
wrapper
):
wrapper
.
add_to_makefile
(
"
REQUIRED
"
,
"
foo
"
)
wrapper
.
add_
var_
to_makefile
(
"
REQUIRED
"
,
"
foo
"
)
rc
,
_
,
errs
=
run_make
(
wrapper
,
"
build
"
)
rc
,
_
,
errs
=
run_make
(
wrapper
,
"
build
"
)
assert
rc
==
2
assert
rc
==
2
...
@@ -102,8 +102,8 @@ def test_header_install_location(wrapper):
...
@@ -102,8 +102,8 @@ def test_header_install_location(wrapper):
extensions
=
[
"
h
"
,
"
hpp
"
,
"
hxx
"
,
"
hh
"
]
extensions
=
[
"
h
"
,
"
hpp
"
,
"
hxx
"
,
"
hh
"
]
for
ext
in
extensions
:
for
ext
in
extensions
:
wrapper
.
add_to_makefile
(
"
HEADERS
"
,
f
"
db/subdir/header.
{
ext
}
"
)
wrapper
.
add_
var_
to_makefile
(
"
HEADERS
"
,
f
"
db/subdir/header.
{
ext
}
"
)
wrapper
.
add_to_makefile
(
"
KEEP_HEADER_SUBDIRS
"
,
"
db
"
)
wrapper
.
add_
var_
to_makefile
(
"
KEEP_HEADER_SUBDIRS
"
,
"
db
"
)
for
ext
in
extensions
:
for
ext
in
extensions
:
(
subdir
/
f
"
header.
{
ext
}
"
).
touch
()
(
subdir
/
f
"
header.
{
ext
}
"
).
touch
()
...
@@ -126,8 +126,8 @@ def test_updated_dependencies(wrappers):
...
@@ -126,8 +126,8 @@ def test_updated_dependencies(wrappers):
old_version
=
"
0.0.0+0
"
old_version
=
"
0.0.0+0
"
wrapper_main
.
add_to_makefile
(
"
REQUIRED
"
,
wrapper_dep
.
name
)
wrapper_main
.
add_
var_
to_makefile
(
"
REQUIRED
"
,
wrapper_dep
.
name
)
wrapper_main
.
add_to_makefile
(
wrapper_main
.
add_
var_
to_makefile
(
f
"
{
wrapper_dep
.
name
}
_VERSION
"
,
old_version
,
modifier
=
""
f
"
{
wrapper_dep
.
name
}
_VERSION
"
,
old_version
,
modifier
=
""
)
)
...
@@ -152,7 +152,7 @@ def test_updated_dependencies(wrappers):
...
@@ -152,7 +152,7 @@ def test_updated_dependencies(wrappers):
)
)
assert
rc
==
0
assert
rc
==
0
wrapper_main
.
add_to_makefile
(
wrapper_main
.
add_
var_
to_makefile
(
f
"
{
wrapper_dep
.
name
}
_VERSION
"
,
new_version
,
modifier
=
""
f
"
{
wrapper_dep
.
name
}
_VERSION
"
,
new_version
,
modifier
=
""
)
)
...
...
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