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
d37a42f4
Commit
d37a42f4
authored
2 years ago
by
Lucas Magalhães
Browse files
Options
Downloads
Patches
Plain Diff
Block cell and non cell targets together
parent
dadb4766
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!118
E3-975: Block cell and non cell targets together
Pipeline
#124660
passed
2 years ago
Stage: check
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure/E3/CONFIG_CELL
+5
-0
5 additions, 0 deletions
configure/E3/CONFIG_CELL
tests/test_build.py
+20
-0
20 additions, 0 deletions
tests/test_build.py
with
25 additions
and
0 deletions
configure/E3/CONFIG_CELL
+
5
−
0
View file @
d37a42f4
# TOP is e3-MODULENAME
ifneq (,$(findstring cell,$(MAKECMDGOALS)))
# Check if non cell targets are being called
NON_CELL_TARGETS=install uninstall build debug rebuild vars
ifneq (,$(filter $(NON_CELL_TARGETS),$(MAKECMDGOALS)))
$(error cell targets cannot be called with non cell targets on the same command line)
endif
## Default is e3-MODULENAME/cellMods
E3_CELL_PATH=$(TOP)/cellMods
##
...
...
This diff is collapsed.
Click to expand it.
tests/test_build.py
+
20
−
0
View file @
d37a42f4
...
...
@@ -607,3 +607,23 @@ def test_double_install_fails(wrapper: Wrapper, module_version):
),
errs
,
)
@pytest.mark.parametrize
(
"
targets
"
,
[
[
"
cellbuild
"
,
"
build
"
],
[
"
cellinstall
"
,
"
install
"
],
[
"
vars
"
,
"
cellbuild
"
],
[
"
debug
"
,
"
cellinstall
"
],
[
"
cellbuild
"
,
"
uninstall
"
],
],
ids
=
[
"
build
"
,
"
install
"
,
"
vars
"
,
"
debug
"
,
"
uninstall
"
],
)
def
test_target_fails_with_celltarget
(
wrapper
:
Wrapper
,
targets
):
rc
,
_
,
errs
=
wrapper
.
run_make
(
targets
[
0
],
targets
[
1
])
assert
rc
!=
0
assert
(
"
cell targets cannot be called with non cell targets on the same command line
"
in
errs
)
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