diff --git a/configure/E3/CONFIG b/configure/E3/CONFIG index 0a8d8fed1edaf90e8f5116854b041c9590018f57..6f5efa836efd4aed7cb883f2ac0f302d73265ada 100644 --- a/configure/E3/CONFIG +++ b/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 diff --git a/configure/E3/CONFIG_TEST b/configure/E3/CONFIG_TEST index 0b04b6b37f802ac54ec48f550c5d6490882eea45..473f438126209c29dfa12914951f398b1202c636 100644 --- a/configure/E3/CONFIG_TEST +++ b/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