From 8bf765365ffd3f1ce9e21e9aee616a65c80bfc7f Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 17 Mar 2015 15:26:08 -0400 Subject: [PATCH] std/rec/test: add asTest to RTEMS test harness --- src/ioc/dbStatic/dbStaticLib.c | 4 +++- src/std/rec/test/Makefile | 3 ++- src/std/rec/test/epicsRunRecordTests.c | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ioc/dbStatic/dbStaticLib.c b/src/ioc/dbStatic/dbStaticLib.c index b80a295c3..5318df48a 100644 --- a/src/ioc/dbStatic/dbStaticLib.c +++ b/src/ioc/dbStatic/dbStaticLib.c @@ -1915,7 +1915,9 @@ long dbInitRecordLinks(dbRecordType *rtyp, struct dbCommon *prec) plink->type = CONSTANT; switch (plink->type) { - /* constantStr is allowed to remain NULL if plink->text==NULL */ + /* constantStr is allowed to remain NULL if plink->text==NULL + * constantStr==NULL has special meaning in recGblInitConstantLink() + */ case CONSTANT: plink->value.constantStr = NULL; break; case PV_LINK: plink->value.pv_link.pvname = callocMustSucceed(1, 1, "init PV_LINK"); break; case VME_IO: plink->value.vmeio.parm = pNullString; break; diff --git a/src/std/rec/test/Makefile b/src/std/rec/test/Makefile index 9905d7504..6b28b5a27 100644 --- a/src/std/rec/test/Makefile +++ b/src/std/rec/test/Makefile @@ -17,6 +17,7 @@ recTestIoc_DBD = base.dbd TESTFILES += $(COMMON_DIR)/recTestIoc.dbd testHarness_SRCS += recTestIoc_registerRecordDeviceDriver.cpp +testHarness_SRCS += asTestIoc_registerRecordDeviceDriver.cpp TESTPROD_HOST += arrayOpTest arrayOpTest_SRCS += arrayOpTest.c @@ -31,7 +32,7 @@ asTestIoc_DBD += asTest.dbd TESTPROD_HOST += asTest asTest_SRCS += asTest.c asTest_SRCS += asTestIoc_registerRecordDeviceDriver.cpp -#testHarness_SRCS += asTest.c +testHarness_SRCS += asTest.c TESTFILES += ../asTest.db TESTS += asTest diff --git a/src/std/rec/test/epicsRunRecordTests.c b/src/std/rec/test/epicsRunRecordTests.c index 092c0a6ce..1a5858d76 100644 --- a/src/std/rec/test/epicsRunRecordTests.c +++ b/src/std/rec/test/epicsRunRecordTests.c @@ -14,6 +14,7 @@ int analogMonitorTest(void); int arrayOpTest(void); +int asTest(void); void epicsRunRecordTests(void) { @@ -23,5 +24,7 @@ void epicsRunRecordTests(void) runTest(arrayOpTest); + runTest(asTest); + epicsExit(0); /* Trigger test harness */ }