diff --git a/src/ioc/db/test/Makefile b/src/ioc/db/test/Makefile index 43ea497ed..9b7a62fca 100644 --- a/src/ioc/db/test/Makefile +++ b/src/ioc/db/test/Makefile @@ -20,8 +20,11 @@ TESTS += callbackTest # When we add more test programs here, this must become a vxTestHarness TESTSPEC_vxWorks = callbackTest.munch; callbackTest +DBDINC += xRecord + TESTPROD_HOST += dbChannelTest dbChannelTest_SRCS += dbChannelTest.c +dbChannelTest_SRCS += xRecord_registerRecordDeviceDriver.cpp dbChannelTest_LIBS += dbCore OBJS_IOC_vxWorks += dbChannelTest TESTS += dbChannelTest diff --git a/src/ioc/db/test/dbChannelTest.c b/src/ioc/db/test/dbChannelTest.c index 1653fbe69..ef37041d1 100644 --- a/src/ioc/db/test/dbChannelTest.c +++ b/src/ioc/db/test/dbChannelTest.c @@ -16,9 +16,13 @@ #include "dbChannel.h" #include "dbStaticLib.h" #include "dbAccessDefs.h" +#include "recSup.h" #include "epicsUnitTest.h" #include "testMain.h" +#define GEN_SIZE_OFFSET +#include "xRecord.h" + /* Expected call bit definitions */ #define e_start 0x00000001 #define e_abort 0x00000002 @@ -152,7 +156,9 @@ MAIN(dbChannelTest) testPlan(68); - testOk1(!dbReadDatabase(&pdbbase, "dbChannelTest.dbx", ".:..", NULL)); + testOk1(!dbReadDatabase(&pdbbase, "xRecord.dbd", ".:..", NULL)); + xRecord_registerRecordDeviceDriver(pdbbase); + testOk1(!dbReadDatabase(&pdbbase, "dbChannelTest.db", ".:..", NULL)); testOk(!!pdbbase, "pdbbase was set"); r = e = 0; @@ -243,3 +249,9 @@ MAIN(dbChannelTest) return testDone(); } + +#include + +static +rset xRSET; +epicsExportAddress(rset,xRSET); diff --git a/src/ioc/db/test/dbChannelTest.db b/src/ioc/db/test/dbChannelTest.db new file mode 100644 index 000000000..a6fa08e40 --- /dev/null +++ b/src/ioc/db/test/dbChannelTest.db @@ -0,0 +1,2 @@ +record(x, x) {} + diff --git a/src/ioc/db/test/dbChannelTest.dbx b/src/ioc/db/test/xRecord.dbd similarity index 92% rename from src/ioc/db/test/dbChannelTest.dbx rename to src/ioc/db/test/xRecord.dbd index b743359c1..4837871a4 100644 --- a/src/ioc/db/test/dbChannelTest.dbx +++ b/src/ioc/db/test/xRecord.dbd @@ -10,4 +10,3 @@ recordtype(x) { prompt("Value") } } -record(x, x) {}