From 312a6029525ea245bf341c66471cf0fae7d6c8d1 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Wed, 26 Feb 2025 16:39:02 +0100 Subject: [PATCH] support CROSS_COMPILER_RUNTESTS_ARCHS other than RTEMS --- modules/database/test/ioc/db/Makefile | 4 ++-- modules/database/test/std/filters/Makefile | 4 ++-- modules/database/test/std/link/Makefile | 4 ++-- modules/database/test/std/rec/Makefile | 4 ++-- modules/libcom/test/Makefile | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/database/test/ioc/db/Makefile b/modules/database/test/ioc/db/Makefile index 4395c291e..369bac9d7 100644 --- a/modules/database/test/ioc/db/Makefile +++ b/modules/database/test/ioc/db/Makefile @@ -208,8 +208,8 @@ TESTSPEC_RTEMS = dbTestHarness.boot; epicsRunDbTests TESTSCRIPTS_HOST += $(TESTS:%=%.t) ifneq ($(filter $(T_A),$(CROSS_COMPILER_RUNTEST_ARCHS)),) -TESTPROD_RTEMS = $(TESTPROD_HOST) -TESTSCRIPTS_RTEMS += $(TESTS:%=%.t) +TESTPROD += $(TESTPROD_HOST) +TESTSCRIPTS += $(TESTS:%=%.t) endif include $(TOP)/configure/RULES diff --git a/modules/database/test/std/filters/Makefile b/modules/database/test/std/filters/Makefile index 2576ce46d..e078b3727 100644 --- a/modules/database/test/std/filters/Makefile +++ b/modules/database/test/std/filters/Makefile @@ -81,8 +81,8 @@ TESTSPEC_RTEMS = filterTestHarness.boot; epicsRunFilterTests TESTSCRIPTS_HOST += $(TESTS:%=%.t) ifneq ($(filter $(T_A),$(CROSS_COMPILER_RUNTEST_ARCHS)),) -TESTPROD_RTEMS = $(TESTPROD_HOST) -TESTSCRIPTS_RTEMS += $(TESTS:%=%.t) +TESTPROD += $(TESTPROD_HOST) +TESTSCRIPTS += $(TESTS:%=%.t) endif include $(TOP)/configure/RULES diff --git a/modules/database/test/std/link/Makefile b/modules/database/test/std/link/Makefile index fca089966..e4410d76e 100644 --- a/modules/database/test/std/link/Makefile +++ b/modules/database/test/std/link/Makefile @@ -57,8 +57,8 @@ TESTSPEC_RTEMS = linkTestHarness.boot; epicsRunLinkTests TESTSCRIPTS_HOST += $(TESTS:%=%.t) ifneq ($(filter $(T_A),$(CROSS_COMPILER_RUNTEST_ARCHS)),) - TESTPROD = $(TESTPROD_HOST) - TESTSCRIPTS_RTEMS += $(TESTS:%=%.t) + TESTPROD += $(TESTPROD_HOST) + TESTSCRIPTS += $(TESTS:%=%.t) endif include $(TOP)/configure/RULES diff --git a/modules/database/test/std/rec/Makefile b/modules/database/test/std/rec/Makefile index ebc4ac3d0..377e747e0 100644 --- a/modules/database/test/std/rec/Makefile +++ b/modules/database/test/std/rec/Makefile @@ -251,8 +251,8 @@ TESTSPEC_RTEMS = recordTestHarness.boot; epicsRunRecordTests TESTSCRIPTS_HOST += $(TESTS:%=%.t) ifneq ($(filter $(T_A),$(CROSS_COMPILER_RUNTEST_ARCHS)),) -TESTPROD_RTEMS = $(TESTPROD_HOST) -TESTSCRIPTS_RTEMS += $(TESTS:%=%.t) +TESTPROD += $(TESTPROD_HOST) +TESTSCRIPTS += $(TESTS:%=%.t) endif include $(TOP)/configure/RULES diff --git a/modules/libcom/test/Makefile b/modules/libcom/test/Makefile index a3893661f..195f97dc1 100644 --- a/modules/libcom/test/Makefile +++ b/modules/libcom/test/Makefile @@ -295,7 +295,7 @@ TESTSPEC_RTEMS = libComTestHarness.boot; epicsRunLibComTests TESTSCRIPTS_HOST += $(TESTS:%=%.t) ifneq ($(filter $(T_A),$(CROSS_COMPILER_RUNTEST_ARCHS)),) -TESTPROD = $(TESTPROD_HOST) +TESTPROD += $(TESTPROD_HOST) TESTSCRIPTS += $(filter-out epicsUnitTestTest.t, $(TESTS:%=%.t)) endif