Skip to content
Snippets Groups Projects
Commit 5652184c authored by Lucas Magalhães's avatar Lucas Magalhães
Browse files

Merge branch 'block_cellinstall_install' into 'master'

E3-975: Block cell and non cell targets together

See merge request e3/e3-require!118
parents dadb4766 d37a42f4
No related branches found
No related tags found
1 merge request!118E3-975: Block cell and non cell targets together
Pipeline #124834 passed
# 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
##
......
......@@ -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
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment