From bdd41cca13543baa87a33d70e3ed817356a0b5a5 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Wed, 10 Jun 2020 14:46:18 -0700 Subject: [PATCH] move test of registerAllRecordDeviceDrivers() --- modules/database/test/std/rec/analogMonitorTest.c | 4 ---- modules/database/test/std/rec/recMiscTest.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/database/test/std/rec/analogMonitorTest.c b/modules/database/test/std/rec/analogMonitorTest.c index 5f79d7767..bf79bdd83 100644 --- a/modules/database/test/std/rec/analogMonitorTest.c +++ b/modules/database/test/std/rec/analogMonitorTest.c @@ -12,7 +12,6 @@ #include #include "registryFunction.h" -#include "iocshRegisterCommon.h" #include "osiFileName.h" #include "epicsThread.h" #include "epicsMath.h" @@ -162,10 +161,7 @@ MAIN(analogMonitorTest) "../O.Common" OSI_PATH_LIST_SEPARATOR "O.Common", NULL)) testAbort("Error reading database description 'analogMonitorTest.dbd'"); - /* testing registerAllRecordDeviceDrivers() */ - registerAllRecordDeviceDrivers(pdbbase); analogMonitorTest_registerRecordDeviceDriver(pdbbase); - registerAllRecordDeviceDrivers(pdbbase); if (dbReadDatabase(&pdbbase, "analogMonitorTest.db", "." OSI_PATH_LIST_SEPARATOR "..", NULL)) diff --git a/modules/database/test/std/rec/recMiscTest.c b/modules/database/test/std/rec/recMiscTest.c index 9bcebc28a..af45318e7 100644 --- a/modules/database/test/std/rec/recMiscTest.c +++ b/modules/database/test/std/rec/recMiscTest.c @@ -10,6 +10,7 @@ #include "dbAccess.h" #include "errlog.h" #include "dbStaticLib.h" +#include "iocshRegisterCommon.h" #include "dbUnitTest.h" #include "testMain.h" @@ -69,7 +70,10 @@ MAIN(recMiscTest) testdbReadDatabase("recTestIoc.dbd", NULL, NULL); + /* A smoke test of registerAllRecordDeviceDrivers to check for idempotence */ + registerAllRecordDeviceDrivers(pdbbase); recTestIoc_registerRecordDeviceDriver(pdbbase); + registerAllRecordDeviceDrivers(pdbbase); testdbReadDatabase("recMiscTest.db", NULL, NULL);