Merge branch 'e3-1751' into 'master'

E3-1751: Fix make test to use cellbuild's path

See merge request !207

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Exit `iocsh` if file to run does not exist
 * Add trigger mapping on `LoadedModules` to silence QSRV2 warning
 * Silence warnings on submodule initialisation
+* Automatically use cell path with `test` target (no longer any need to activate an environment as part of the test rule)
 
 ## [5.1.1]
 

configure/E3/CONFIG_TEST

 TEST_DIR:=$(TOP)/tests
 
-RUN_IOCSH_TEST_COMMAND = run-iocsh -r "$(E3_MODULE_NAME),$(E3_MODULE_VERSION)" -l $(TEMP_CELL_PATH)
+RUN_IOCSH_TEST_COMMAND = run-iocsh -r "$(E3_MODULE_NAME),$(E3_MODULE_VERSION)"
 TEMP_CELL_PATH := $(TOP)/testMods-$(shell date +"%y%m%d%H%M%S")
 RMDIR = $(RM) -rf
 
@@ -12,4 +12,7 @@ VARS_EXCLUDES+=TEMP_CELL_PATH
 
 ifneq (,$(findstring test,$(MAKECMDGOALS)))
   E3_MODULES_PATH=$(TEMP_CELL_PATH)/$(notdir $(EPICS_BASE))/require-$(E3_REQUIRE_VERSION)
+  # We have to do the export here since the sub-processes - like run-iocsh - otherwise would not inherit the variable
+  export EPICS_DRIVER_PATH:=$(E3_MODULES_PATH):$(EPICS_DRIVER_PATH)
+  PATH:=$(EPICS_BASE)/require/$(E3_REQUIRE_VERSION)/bin:$(PATH)
 endif