From e6a883bc5f2676d782ab1e292f06bef74b5d795a Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 5 Aug 2014 14:29:14 +0200 Subject: [PATCH] std/rec/test: explicitly register test subroutine for subroutine record (fix build on MinGW) --- src/std/rec/test/Makefile | 1 - src/std/rec/test/analogMonitorTest.c | 3 ++- src/std/rec/test/myTestSub.dbd | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 src/std/rec/test/myTestSub.dbd diff --git a/src/std/rec/test/Makefile b/src/std/rec/test/Makefile index bfb8740d5..b8657ce83 100644 --- a/src/std/rec/test/Makefile +++ b/src/std/rec/test/Makefile @@ -14,7 +14,6 @@ PROD_LIBS = dbRecStd dbCore ca Com TARGETS += $(COMMON_DIR)/analogMonitorTest.dbd analogMonitorTest_DBD += base.dbd -analogMonitorTest_DBD += myTestSub.dbd TESTPROD_HOST += analogMonitorTest analogMonitorTest_SRCS += analogMonitorTest.c analogMonitorTest_SRCS += analogMonitorTest_registerRecordDeviceDriver.cpp diff --git a/src/std/rec/test/analogMonitorTest.c b/src/std/rec/test/analogMonitorTest.c index f0c1950c1..56f3cf475 100644 --- a/src/std/rec/test/analogMonitorTest.c +++ b/src/std/rec/test/analogMonitorTest.c @@ -75,7 +75,6 @@ static int t_ReceivedUpdates[NO_OF_PATTERNS][NO_OF_VALUES_PER_SEQUENCE]; static long myTestSub(void *p) { return 0; } -epicsRegisterFunction(myTestSub); /* Minimal pre-chain plugin to divert all monitors back into the test (before they hit the queue) */ @@ -152,6 +151,8 @@ MAIN(analogMonitorTest) t_SetValues[14][0] = -epicsINF; t_SetValues[14][1] = epicsINF; t_SetValues[15][0] = -epicsINF; t_SetValues[15][1] = -epicsINF; + registryFunctionAdd("myTestSub", (REGISTRYFUNCTION) myTestSub); + testPlan(1793); if (dbReadDatabase(&pdbbase, "analogMonitorTest.dbd", diff --git a/src/std/rec/test/myTestSub.dbd b/src/std/rec/test/myTestSub.dbd deleted file mode 100644 index eb0943b54..000000000 --- a/src/std/rec/test/myTestSub.dbd +++ /dev/null @@ -1 +0,0 @@ -function(myTestSub)