move test of registerAllRecordDeviceDrivers()

This commit is contained in:
Michael Davidsaver
2020-06-10 14:46:18 -07:00
parent e40970bd5e
commit bdd41cca13
2 changed files with 4 additions and 4 deletions

View File

@@ -12,7 +12,6 @@
#include <string.h>
#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))

View File

@@ -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);