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

Set custom E3_MODULES_PATH for test target

The test rule for e3 modules actually does a cellinstall and run the
tests inside this temporary installation. The cellinstall needs to
overwrite some path variables to work this variables were not accessible
through the test rule as they are just changed if cell is on
MAKECMDGOALS. This made impossible to use the standard path variables
inside module's custom test rules.

To fix it the same mechanism used in cellinstall is implemented for test
and the variables paths are now overwritten. This makes possible ie. to
use E3_MODULES_INSTALL_LOCATION_BIN inside custom test rules.

This commit also introduces an unwanted behavior. As the test rule is
now overwriting the standard path variables it cannot longer be along
with the install rule. For example, running `make test install` will
install the module inside the test dir. This is a known issue for
cellinstall as well and a restructure of the Makefile code should be
made to isolate the rules.
parent 3e0b11e5
No related branches found
No related tags found
No related merge requests found
......@@ -9,9 +9,9 @@ include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION
include $(REQUIRE_CONFIG)/CONFIG_REQUIRE
include $(REQUIRE_CONFIG)/CONFIG_SHELL
include $(REQUIRE_CONFIG)/CONFIG_CELL
include $(REQUIRE_CONFIG)/CONFIG_TEST
include $(REQUIRE_CONFIG)/CONFIG_E3_PATH
include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE
include $(REQUIRE_CONFIG)/CONFIG_TEST
include $(REQUIRE_CONFIG)/CONFIG_EPICS
include $(REQUIRE_CONFIG)/CONFIG_DKMS
include $(REQUIRE_CONFIG)/CONFIG_EXPORT
......
......@@ -9,3 +9,7 @@ EXPORT_VARS+=TEMP_CELL_PATH
VARS_EXCLUDES+=TEST_DIR
VARS_EXCLUDES+=RMDIR
VARS_EXCLUDES+=TEMP_CELL_PATH
ifneq (,$(findstring test,$(MAKECMDGOALS)))
E3_MODULES_PATH=$(TEMP_CELL_PATH)/$(notdir $(EPICS_BASE))/require-$(E3_REQUIRE_VERSION)
endif
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