Merge branch 'E3-920' into 'master'

E3-920: Set custom E3_MODULES_PATH for test target

See merge request e3/e3-require!93

configure/E3/CONFIG

@@ -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

configure/E3/CONFIG_TEST

@@ -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