.flake8

-[flake8]
-ignore = E501, E203, W503
-# E501, E203: black
-# W503: PEP8

.gitignore

@@ -17,7 +17,11 @@ core.*
 cellMods
 *.log
 __pycache__
+.iocsh_history
+.gdb_history
+venv
 
 require-ess/require.Makefile
+require-ess/O.*
 require-ess/Db/*.db
 require-ess/Db/*.d

.gitlab-ci.yml

 ---
+variables:
+  E3_CI_MODIFIED_BASE_VERSION: "7.0.8.1-68332f4-20240917T140931"  # strip the first part of the tag name - see E3-1529
+
 stages:
   - check
   - build
@@ -7,17 +10,11 @@ stages:
 default:
   tags:
     - docker
-  image: registry.esss.lu.se/ics-docker/centos-e3:$E3_CI_DOCKER_VERSION
-
-
-### stage: check
+  image: registry.esss.lu.se/ics-docker/centos-e3:latest
 
-run pre-commit:
-  stage: check
-  image: registry.esss.lu.se/ics-docker/pre-commit:latest
-  script:
-    - pre-commit run --all-files
-  allow_failure: true
+include:
+  - project: "ics-infrastructure/gitlab-ci-yml"
+    file: "PreCommit.gitlab-ci.yml"
 
 shellcheck:
   image: pipelinecomponents/shellcheck:latest
@@ -40,12 +37,12 @@ shfmt:
   before_script:
     - shfmt -version
   script:
-    - shfmt -i 2 -ci -d .  # 2 spaces indent, indent switch-case statements, show diff (don't apply change)
+    - shfmt -i 2 -ci -d . # 2 spaces indent, indent switch-case statements, show diff (don't apply change)
 
 build require:
   stage: build
   before_script:
-    - curl -L -o epics.tar.gz https://artifactory.esss.lu.se/artifactory/e3/epics-base-$E3_CI_BASE_VERSION.tar.gz
+    - curl -L -o epics.tar.gz https://artifactory.esss.lu.se/artifactory/e3/epics-base-$E3_CI_MODIFIED_BASE_VERSION.tar.gz
     - tar -zxvf epics.tar.gz
     - export BASE_PATH=$(ls -d $(pwd)/epics/base-*)
     - echo "EPICS_BASE:=${BASE_PATH}" >> configure/RELEASE.local
@@ -65,7 +62,9 @@ build require:
 test require:
   stage: test
   before_script:
-    - source $(pwd)/epics/base-*/require/*/bin/setE3Env.bash
+    - source $(pwd)/epics/base-*/require/*/bin/activate
+    # We need to allow file:// protocol for all of the tests to work
+    - git config --global procotol.file.allow always
   script:
     - make test
   needs:

.pre-commit-config.yaml

 repos:
-  - repo: https://github.com/ambv/black
-    rev: 22.3.0
+  - repo: https://github.com/psf/black
+    rev: 22.8.0
     hooks:
       - id: black
-  - repo: https://gitlab.com/pycqa/flake8.git
-    rev: 3.9.2
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.0.238
     hooks:
-    -   id: flake8
+      - id: ruff
+  - repo: https://github.com/PyCQA/doc8.git
+    rev: v1.0.0 # 1.1.0 drops python3.6 support
+    hooks:
+      - id: doc8
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.0.1 # 4.2.0 drops python3.6 support
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
-  - repo: https://github.com/timothycrosley/isort
-    rev: 5.10.1
-    hooks:
-    - id: isort
-      args: ["--profile", "black"]
+      - id: check-yaml
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v13.0.0
     hooks:
     - id: clang-format
-  - repo: https://github.com/pocc/pre-commit-hooks
-    rev: v1.3.5
-    hooks:
-    - id: cppcheck
-      args: ["--enable=all", "--suppress=missingIncludeSystem", "--language=c", "--std=c99"]

CHANGELOG.md

 # CHANGELOG
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
@@ -6,6 +7,87 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### New Features
+
+* Remove `--realtime` option from `iocsh`
+* Add timestamp for `LoadedModules`
+* Deprecate `IOCNAME` environment variable in favour of `--iocname` argument for `iocsh`
+* Add environment variable `E3_STRICT_CC`: if set to `YES` then driver.Makefile will
+  fail if a cross-compiler is missing
+* Support for e3 on Mac OS (both intel and apple silicon)
+
+### Bugfixes
+
+* Decouple `build` and `install` targets
+* 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]
+
+### Bugfixes
+
+* Fix memory leaks on IOC exit
+* Fix dirty terminal after IOC exit for some distributions
+* Fix crash when running `make test` without having activated an environment
+* Resolve `E3_CMD_TOP` when a startup script is being run with `iocsh` (previously expanded to just `.`)
+* Fix truncated errorlog messages
+
+## [5.1.0]
+
+### New Features
+
+* Allow for module-specific build rules (see: sequencer) to be installed and used
+  within e3
+* Automatically install LICENSE files with modules
+* `afterInit` can now run commands of arbitrary length. Note: The syntax has changed from
+  ```
+  afterInit foo bar baz
+  ```
+  to
+  ```
+  afterInit 'foo bar baz'
+  ```
+* Add NTTable PV for module and version information as `LoadedModules`
+
+### Bugfixes
+
+* Fixed an issue where .template and .substitutions files with the same name would build incorrectly
+* Fixed an issue where filenames with spaces in them that had been modified
+in the wrapper would cause all of the module `make` commands to fail.
+* Removed a number of memory leaks found by valgrind
+* Fixed issue where failure of one of the patches to apply wouldn't stop the build
+* Fixed memory leak in `afterInit`
+
+### Other changes
+
+* Rewrite `iocsh` converting it from being a shell script to a python (3.6) script
+  * Remove support for file extensions: `.so`, `.dbd`, `.db`, `.substitutions`, `.template`, `.iocsh`
+  * Remove support for `nice`
+  * Remove support for sequencer programs
+  * Remove optional argument passing to `gdb`
+  * Change the IOC shell to use both stdout and stderr (previously only stdout)
+  * Change default prompt
+  * Change fallback IOC-name (used when `IOCNAME` is not set)
+  * Multiple argument changes; e.g.
+    * Shortened argument for printing version and exit changed from `-v` to `-V`
+    * Make running IOC as realtime or with debuggers mutually exclusive
+    * Change how arguments are passed to `gdb` and `valgrind` (see help: `--help`)
+* Removed `tclx` script to expand .dbd in favour of `dbdExpand.pl` from EPICS base
+* Removed `hdrs` target. Note that this has been entirely replaced by the automatic db expansion.
+* Removed ability to pass `args` to require (which have not been used within e3)
+* Removed `require module,ifexists` option
+* Stop require from looking in legacy locations for various files
+* Rewrite internal linked list to have better memory safety
+* Removed enabling of core dump generation and max file size limit to allow developers more flexibility (enable and set limit by calling `ulimit -S -c x` where x is max size in blocks before IOC startup)
+* Remove `ARCH_FILTER` support; from now on, only `EXCLUDE_ARCHS` is used.
+* Remove `setE3Env.bash` alias (for `activate`)
+* Remove custom `dbLoadTemplate` in favour of the one supplied by EPICS base
+  * Note that this amounts to a change where double quotes (`"`) must be used in substitutions files when using macros in patterns
+
+## [5.0.0]
+
 ### New Features
 * Recursive dependency for headers at build-time. This is a more major change that involves:
   * Module dependecies are now fetched from `CONFIG_MODULE` in the sense that `X_DEP_VERSION` is parsed as a
@@ -15,6 +97,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bugfixes
 * Fixed issue where updated dependencies of substitution files did not retrigger a .db expansion.
+* db expansion happens at build time, not at install time.
 
 ### Other changes
 * Remove `IOCNAME:exit` PV. Stop loading `softIocExit.db` and now it's require that exposes the `BaseVersion` PV.
@@ -22,6 +105,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   not by require.
 * The loop over `EPICSVERSION` in `driver.makefile` has been removed; various other cleanup has been performed.
 * Improved output during IOC startup
+* e3-sequencer tests added, as well as removing pre-processing of .stt files.
+* Remove Win32 and CYGWIN32 support
+* Remove `/tools` directory, including `test_installed_modules.sh` utility
+* Remove `runScript`
+* Drop file extension from `build_number.sh`
+* Rename `setE3Env.bash` to `activate`
+* Add alias from `setE3Env.bash` to `activate`
+* Updated PV-names to be ESS compliant, and remove VERSIONS PV
+* Changed from `build number` to `revision number`
+* Added revision number parsing for test versions
+* Joined together the variables `REQUIRE_CONFIG` and `E3_REQUIRE_CONFIG`
+* Removed legacy file `DECOUPLE_FLAGS`
 
 ## [4.0.0]
 
@@ -171,7 +266,10 @@ of course pin a specific module version. If they do not, then the highest numeri
   startup script
 
 
-[Unreleased]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/4.0.0...master
+[Unreleased]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/5.1.1...master
+[5.1.1]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/5.1.0...5.1.1
+[5.1.0]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/5.0.0...5.1.0
+[5.0.0]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/4.0.0...5.0.0
 [4.0.0]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/3.4.1...4.0.0
 [3.4.1]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/3.4.0...3.4.1
 [3.4.0]: https://gitlab.esss.lu.se/e3/e3-require/-/compare/3.3.0...3.4.0

COPYRIGHT

+Copyright (C) 2024 European Spallation Source ERIC
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

README.md

@@ -40,7 +40,7 @@ $ make install
 
 To test your build, run
 ```bash
-$ source ${EPICS_BASE}/require/${E3_REQUIRE_VERSION}/bin/setE3Env.bash
+$ source ${EPICS_BASE}/require/${E3_REQUIRE_VERSION}/bin/activate
 $ iocsh
 ```
 

configure/CONFIG

@@ -19,16 +19,16 @@ endif
 
 
 E3_MODULES_PATH:=$(EPICS_BASE)
-REQUIRE_CONFIG:=$(TOP)/configure/E3
+E3_REQUIRE_CONFIG:=$(TOP)/configure/E3
 
 include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION
-include $(REQUIRE_CONFIG)/CONFIG_REQUIRE
-include $(REQUIRE_CONFIG)/CONFIG_SHELL
-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_EXPORT
+include $(E3_REQUIRE_CONFIG)/CONFIG_REQUIRE
+include $(E3_REQUIRE_CONFIG)/CONFIG_SHELL
+include $(E3_REQUIRE_CONFIG)/CONFIG_E3_PATH
+include $(E3_REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE
+include $(E3_REQUIRE_CONFIG)/CONFIG_E3_META
+include $(E3_REQUIRE_CONFIG)/CONFIG_TEST
+include $(E3_REQUIRE_CONFIG)/CONFIG_EXPORT
 
 # Exclude generated EPICS base variables from make vars report.
 VARS_EXCLUDES+=BASE_3_14

configure/E3/CONFIG

 # -*- mode: Makefile;-*-
 
-# Update the module version (for numeric versions) with a build number of 0 if none is specified
+# Update the module version (for numeric versions) with a revision number of 0 if none is specified
 E3_MODULE_VERSION:=$(E3_MODULE_VERSION)$(shell (echo "$(E3_MODULE_VERSION)" | grep -Eq "^[0-9]+\.[0-9]+\.[0-9]+\$$") && echo +0)
 
 E3_MODULES_PATH?=$(E3_SITEMODS_PATH)
+E3_REQUIRE_CONFIG:=$(E3_REQUIRE_LOCATION)/configure
 
 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_EPICS
-include $(REQUIRE_CONFIG)/CONFIG_DKMS
-include $(REQUIRE_CONFIG)/CONFIG_EXPORT
+include $(E3_REQUIRE_CONFIG)/CONFIG_REQUIRE
+include $(E3_REQUIRE_CONFIG)/CONFIG_SHELL
+include $(E3_REQUIRE_CONFIG)/CONFIG_CELL
+include $(E3_REQUIRE_CONFIG)/CONFIG_PATCH
+include $(E3_REQUIRE_CONFIG)/CONFIG_TEST
+include $(E3_REQUIRE_CONFIG)/CONFIG_E3_PATH
+include $(E3_REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE
+include $(E3_REQUIRE_CONFIG)/CONFIG_E3_META
+include $(E3_REQUIRE_CONFIG)/CONFIG_DKMS
+include $(E3_REQUIRE_CONFIG)/CONFIG_EXPORT
 
 VARS_EXCLUDES+=BASE_3_14
 VARS_EXCLUDES+=BASE_3_15

configure/E3/CONFIG_CELL

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

configure/E3/CONFIG_E3_MAKEFILE

@@ -2,26 +2,25 @@
 #
 
 E3_REQUIRE_MAKEFILE_INPUT_OPTIONS := -C $(E3_MODULE_SRC_PATH)
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += -f $(E3_MODULE_MAKEFILE)
+E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += -f ../$(E3_MODULE_MAKEFILE)
 E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += LIBVERSION="$(E3_MODULE_VERSION)"
 E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += PROJECT="$(E3_MODULE_NAME)"
 E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += EPICS_MODULES="$(E3_MODULES_PATH)"
 E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += EPICS_LOCATION="$(EPICS_BASE)"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += BUILDCLASSES="Linux"
 E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITEMODS_PATH="$(E3_SITEMODS_PATH)"
 
 ifeq ($(shell git status > /dev/null 2>&1; echo $$?),0)
 GIT_REMOTE_NAME := $(shell git remote | head -n 1)
 
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_DESC="$(shell git rev-parse HEAD 2> /dev/null || echo 'Not a git repository')"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_STATUS="[ $(shell git status --porcelain | sed 's/^/\\\\\\\"/' | sed 's/$$/\\\\\\\", /')]"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_URL="$(shell git config --get remote.$(GIT_REMOTE_NAME).url 2> /dev/null | sed 's%^https://[^@]*@%https://%')"
+$(E3_MODULE_NAME)_E3_GIT_DESC="$(shell git rev-parse HEAD 2> /dev/null || echo 'Not a git repository')"
+$(E3_MODULE_NAME)_E3_GIT_URL="$(shell git config --get remote.$(GIT_REMOTE_NAME).url 2> /dev/null | sed 's%^https://[^@]*@%https://%')"
 else
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_DESC=
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_STATUS=
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_URL=
+$(E3_MODULE_NAME)_E3_GIT_DESC=
+$(E3_MODULE_NAME)_E3_GIT_URL=
 endif
 
+E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_DESC=$($(E3_MODULE_NAME)_E3_GIT_DESC)
+E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_URL=$($(E3_MODULE_NAME)_E3_GIT_URL)
 
 E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS)
 
@@ -30,3 +29,5 @@ E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS)
 
 VARS_EXCLUDES+=E3_REQUIRE_MAKEFILE_INPUT_OPTIONS
 VARS_EXCLUDES+=GIT_REMOTE_NAME
+VARS_EXCLUDES+=$(E3_MODULE_NAME)_E3_GIT_URL
+VARS_EXCLUDES+=$(E3_MODULE_NAME)_E3_GIT_DESC

configure/E3/CONFIG_E3_META

+EPICSVERSION = $(patsubst base-%,%,$(notdir $(EPICS_BASE)))
+COMMON_DIR = $(TOP)/$(E3_MODULE_SRC_PATH)/O.$(EPICSVERSION)_Common
+METAFILE = $(E3_MODULE_NAME)_meta.yaml
+
+MODULE_INSTALL_LOCATION = $(E3_MODULES_PATH)/$(E3_MODULE_NAME)/$(E3_MODULE_VERSION)

configure/E3/CONFIG_EPICS

-COMMUNITY_EPICS_MODULES:=$(EPICS_BASE)/epics-modules
-
-M_AUTOSAVE:=$(COMMUNITY_EPICS_MODULES)/autosave
-M_DEVLIB2:=$(COMMUNITY_EPICS_MODULES)/devlib2
-M_IOCSTATS:=$(COMMUNITY_EPICS_MODULES)/iocStats
-M_ASYN:=$(COMMUNITY_EPICS_MODULES)/asyn
-M_BUSY:=$(COMMUNITY_EPICS_MODULES)/busy
-M_MODBUS:=$(COMMUNITY_EPICS_MODULES)/modbus
-M_MRFIOC2:=$(COMMUNITY_EPICS_MODULES)/mrfioc2
-M_LUA:=$(COMMUNITY_EPICS_MODULES)/lua
-M_IPMICOMM:=$(COMMUNITY_EPICS_MODULES)/ipmiComm
-M_STREAM:=$(COMMUNITY_EPICS_MODULES)/stream
-M_CALC:=$(COMMUNITY_EPICS_MODULES)/calc
-M_MOTOR:=$(COMMUNITY_EPICS_MODULES)/motor
-M_SSCAN:=$(COMMUNITY_EPICS_MODULES)/sscan
-M_SNCSEQ:=$(COMMUNITY_EPICS_MODULES)/seq
-M_IP:=$(COMMUNITY_EPICS_MODULES)/ip
-M_IPAC:=$(COMMUNITY_EPICS_MODULES)/ipac
-M_ADSUPPORT:=$(COMMUNITY_EPICS_MODULES)/adsupport
-M_ADCORE:=$(COMMUNITY_EPICS_MODULES)/adcore
-M_OPCUA:=$(COMMUNITY_EPICS_MODULES)/opcua
-
-
-
-export M_AUTOSAVE
-export M_DEVLIB2
-export M_IOCSTATS
-export M_ASYN
-export M_BUSY
-export M_MODBUS
-export M_MRFIOC2
-export M_LUA
-export M_IPMICOMM
-export M_STREAM
-export M_CALC
-export M_MOTOR
-export M_SSCAN
-export M_SNCSEQ
-export M_IP
-export M_IPAC
-export M_ADSUPPORT
-export M_ADCORE
-export M_OPCUA
-
-## This is needed since the target "epics" (in configure/RULES_MODULE in most modules)
-## uses SUDOBASH to run the make process
-SUDOBASH := bash -c
-
-### Exclude the following variables to display
-VARS_EXCLUDES+=COMMUNITY_EPICS_MODULES
-VARS_EXCLUDES+=M_AUTOSAVE
-VARS_EXCLUDES+=M_DEVLIB2
-VARS_EXCLUDES+=M_IOCSTATS
-VARS_EXCLUDES+=M_ASYN
-VARS_EXCLUDES+=M_BUSY
-VARS_EXCLUDES+=M_MODBUS
-VARS_EXCLUDES+=M_MRFIOC2
-VARS_EXCLUDES+=M_LUA
-VARS_EXCLUDES+=M_IPMICOMM
-VARS_EXCLUDES+=M_STREAM
-VARS_EXCLUDES+=M_CALC
-VARS_EXCLUDES+=M_MOTOR
-VARS_EXCLUDES+=M_SSCAN
-VARS_EXCLUDES+=M_SNCSEQ
-VARS_EXCLUDES+=M_IP
-VARS_EXCLUDES+=M_IPAC
-VARS_EXCLUDES+=M_ADSUPPORT
-VARS_EXCLUDES+=M_ADCORE
-VARS_EXCLUDES+=M_OPCUA
-
-VARS_EXCLUDES+=SUDOBASH

configure/E3/CONFIG_EXPORT

@@ -10,6 +10,7 @@ EXPORT_VARS+=MSI
 EXPORT_VARS+=E3_MODULE_NAME
 EXPORT_VARS+=E3_MODULE_VERSION
 EXPORT_VARS+=E3_SITEMODS_PATH
+EXPORT_VARS+=E3_MODULES_PATH
 EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES))
 
 EXPORT_VARS+=QUIET

configure/E3/CONFIG_PATCH

+# We want to sort these alphabetically to allow for defined ordering of application of patches.
+# Note that make 4.3 onwards sorts correctly, but not necessarily the version we use.
+PATCHES:=$(shell ls $(TOP)/patch/*.p0.patch 2> /dev/null)

configure/E3/CONFIG_REQUIRE

@@ -10,4 +10,3 @@ E3_REQUIRE_LIB:=$(E3_REQUIRE_LOCATION)/lib
 E3_REQUIRE_DB:=$(E3_REQUIRE_LOCATION)/db
 E3_REQUIRE_DBD:=$(E3_REQUIRE_LOCATION)/dbd
 E3_REQUIRE_INC:=$(E3_REQUIRE_LOCATION)/include
-E3_REQUIRE_CONFIG:=$(E3_REQUIRE_LOCATION)/configure

configure/E3/CONFIG_TEST

 TEST_DIR:=$(TOP)/tests
 
-RUN_IOCSH_TEST_COMMAND = run-iocsh --name "${EPICS_BASE}/require/${E3_REQUIRE_VERSION}/bin/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

configure/E3/DECOUPLE_FLAGS

-# Legacy file. Needed since <module>.Makefiles include this.

configure/E3/DEFINES_FT

 # Keep always the module up-to-date
-define git_update =
-git submodule deinit -f $@/
-rm -rf $(TOP)/.git/modules/$@
+define git_update
+rm -rf $(TOP)/$@
 git submodule init $@/
 git submodule update --init --recursive $@/.
 git submodule update --remote --merge $@/
 endef
 
-define git_module_init_update =
-git submodule update --init --recursive $@/.
-git submodule update --remote --merge $@/
-endef
-
 define patch_site
 patches=$$(ls $(TOP)/patch/*.p0.patch 2> /dev/null); \
 if [ -n "$$patches" ]; then \
@@ -42,7 +36,6 @@ endif
 
 ### Exclude the following variables to display
 VARS_EXCLUDES+=git_update
-VARS_EXCLUDES+=git_module_init_update
 VARS_EXCLUDES+=patch_site
 VARS_EXCLUDES+=patch_revert_site
 VARS_EXCLUDES+=QUIET