From 09a17127a9eedabe78ab3e046ef229e526499c3a Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Mon, 2 Sep 2019 10:46:10 +0200 Subject: [PATCH] make xxxTestHarness TESTPRODs instead of PRODs --- 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 | 4 ++-- modules/pvAccess | 2 +- modules/pvData | 2 +- modules/pvDatabase | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/database/test/ioc/db/Makefile b/modules/database/test/ioc/db/Makefile index e1f06cd3b..b94161d7d 100644 --- a/modules/database/test/ioc/db/Makefile +++ b/modules/database/test/ioc/db/Makefile @@ -182,8 +182,8 @@ dbTestHarness_SRCS_RTEMS += rtemsTestHarness.c PROD_SRCS_RTEMS += rtemsTestData.c -PROD_vxWorks = dbTestHarness -PROD_RTEMS = dbTestHarness +TESTPROD_vxWorks = dbTestHarness +TESTPROD_RTEMS = dbTestHarness TESTSPEC_vxWorks = dbTestHarness.munch; epicsRunDbTests TESTSPEC_RTEMS = dbTestHarness.boot; epicsRunDbTests diff --git a/modules/database/test/std/filters/Makefile b/modules/database/test/std/filters/Makefile index 718b8d523..baf340ac7 100644 --- a/modules/database/test/std/filters/Makefile +++ b/modules/database/test/std/filters/Makefile @@ -65,8 +65,8 @@ filterTestHarness_SRCS_RTEMS += rtemsTestHarness.c PROD_SRCS_RTEMS += rtemsTestData.c -PROD_vxWorks = filterTestHarness -PROD_RTEMS = filterTestHarness +TESTPROD_vxWorks = filterTestHarness +TESTPROD_RTEMS = filterTestHarness TESTSPEC_vxWorks = filterTestHarness.munch; epicsRunFilterTests TESTSPEC_RTEMS = filterTestHarness.boot; epicsRunFilterTests diff --git a/modules/database/test/std/link/Makefile b/modules/database/test/std/link/Makefile index 8540cdf84..349645437 100644 --- a/modules/database/test/std/link/Makefile +++ b/modules/database/test/std/link/Makefile @@ -45,8 +45,8 @@ testHarness_SRCS += epicsRunLinkTests.c linkTestHarness_SRCS += $(testHarness_SRCS) linkTestHarness_SRCS_RTEMS += rtemsTestHarness.c -PROD_vxWorks = linkTestHarness -PROD_RTEMS = linkTestHarness +TESTPROD_vxWorks = linkTestHarness +TESTPROD_RTEMS = linkTestHarness TESTSPEC_vxWorks = linkTestHarness.munch; epicsRunLinkTests TESTSPEC_RTEMS = linkTestHarness.boot; epicsRunLinkTests diff --git a/modules/database/test/std/rec/Makefile b/modules/database/test/std/rec/Makefile index 185c2c0c1..a0cf58c9a 100644 --- a/modules/database/test/std/rec/Makefile +++ b/modules/database/test/std/rec/Makefile @@ -158,8 +158,8 @@ recordTestHarness_SRCS_RTEMS += rtemsTestHarness.c PROD_SRCS_RTEMS += rtemsTestData.c -PROD_vxWorks = recordTestHarness -PROD_RTEMS = recordTestHarness +TESTPROD_vxWorks = recordTestHarness +TESTPROD_RTEMS = recordTestHarness TESTSPEC_vxWorks = recordTestHarness.munch; epicsRunRecordTests TESTSPEC_RTEMS = recordTestHarness.boot; epicsRunRecordTests diff --git a/modules/libcom/test/Makefile b/modules/libcom/test/Makefile index c8680e3e6..a76d3f1d8 100755 --- a/modules/libcom/test/Makefile +++ b/modules/libcom/test/Makefile @@ -247,8 +247,8 @@ testHarness_SRCS += epicsRunLibComTests.c libComTestHarness_SRCS += $(testHarness_SRCS) libComTestHarness_SRCS_RTEMS += rtemsTestHarness.c -PROD_vxWorks = libComTestHarness -PROD_RTEMS += libComTestHarness +TESTPROD_vxWorks = libComTestHarness +TESTPROD_RTEMS += libComTestHarness TESTSPEC_vxWorks = libComTestHarness.munch; epicsRunLibComTests TESTSPEC_RTEMS = libComTestHarness.boot; epicsRunLibComTests diff --git a/modules/pvAccess b/modules/pvAccess index 936f5d35d..60fefdb2c 160000 --- a/modules/pvAccess +++ b/modules/pvAccess @@ -1 +1 @@ -Subproject commit 936f5d35d845a3c47a55176876a0f607a582cf09 +Subproject commit 60fefdb2c10389e14828c48a332eef74bdd4c8e5 diff --git a/modules/pvData b/modules/pvData index 6ceaa6adb..cdd698011 160000 --- a/modules/pvData +++ b/modules/pvData @@ -1 +1 @@ -Subproject commit 6ceaa6adb0b39dc3e37f064ca7e7bb5eea459d96 +Subproject commit cdd6980117cffb96708a1876d512579d6a692e03 diff --git a/modules/pvDatabase b/modules/pvDatabase index 70ee85778..428f78482 160000 --- a/modules/pvDatabase +++ b/modules/pvDatabase @@ -1 +1 @@ -Subproject commit 70ee85778268bb47397d4cf8aa07e019ccdd8392 +Subproject commit 428f7848262deab47f10bcebd145dd0453579ef0