diff --git a/configure/E3/CONFIG_TEST b/configure/E3/CONFIG_TEST index 473f438126209c29dfa12914951f398b1202c636..e8494bcff4ab7409463e1c9671c97934b73e3cd4 100644 --- a/configure/E3/CONFIG_TEST +++ b/configure/E3/CONFIG_TEST @@ -11,5 +11,6 @@ VARS_EXCLUDES+=RMDIR VARS_EXCLUDES+=TEMP_CELL_PATH ifneq (,$(findstring test,$(MAKECMDGOALS))) + TEST_DEBUG_ARCH:=$(if $(and $(findstring debug,$(EPICS_HOST_ARCH)),$(wildcard $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/softIocPVA)),$(EPICS_HOST_ARCH)) E3_MODULES_PATH=$(TEMP_CELL_PATH)/$(notdir $(EPICS_BASE))/require-$(E3_REQUIRE_VERSION) endif diff --git a/configure/E3/RULES_TEST b/configure/E3/RULES_TEST index f542ecb693592fb72d2be104a9af22ee88f25880..148d424b06dc20ffc490de59a5d8815aaeeed049 100644 --- a/configure/E3/RULES_TEST +++ b/configure/E3/RULES_TEST @@ -5,6 +5,10 @@ test: ifeq ($(shell command -v run-iocsh > /dev/null 2>&1 ; echo $$?),0) test: temp_install run_test module_tests cleanup_test +ifneq ($(strip $(TEST_DEBUG_ARCH)),) +run_test: EPICS_HOST_ARCH = $(TEST_DEBUG_ARCH) +module_tests: EPICS_HOST_ARCH = $(TEST_DEBUG_ARCH) +endif .PHONY: temp_install temp_install: