Merge branch '7.0' into PSI-7.0

modules/database/test/std/rec/analogMonitorTest.c

@@ -24,6 +24,7 @@
 #include "chfPlugin.h"
 #include "iocInit.h"
 #include "testMain.h"
+#include "errlog.h"
 #include "epicsExport.h"
 
 /* Test parameters */
@@ -168,7 +169,9 @@ MAIN(analogMonitorTest)
         testAbort("Error reading test database 'analogMonitorTest.db'");
 
     /* Start the core IOC (no CA) */
+    eltc(0);
     iocBuildIsolated();
+    eltc(1);
 
     evtctx = db_init_events();
     chfPluginRegister(test, &pif, NULL);

modules/database/test/std/rec/asTestLib.c

@@ -137,8 +137,9 @@ static void hookPass0(initHookState state)
     dbFinishEntry(&entry);
 }
 
-static long initRec0(aoRecord *prec)
+static long initRecAO(dbCommon *pr)
 {
+    aoRecord *prec = (aoRecord *) pr;
     DBLINK *plink = &prec->out;
     testDiag("init_record(%s)", prec->name);
     testOk(prec->val==2, "VAL %d==2 (pass0 value)", (int)prec->val);
@@ -165,8 +166,9 @@ static long initRec0(aoRecord *prec)
     return 2; /* we set .VAL, so don't use RVAL */
 }
 
-static long initRec1(waveformRecord *prec)
+static long initRecWF(dbCommon *pr)
 {
+    waveformRecord *prec = (waveformRecord *) pr;
     testDiag("init_record(%s)", prec->name);
     testOk(prec->nord==0, "NORD %d==0", (int)prec->nord);
     iran |= 2;
@@ -277,16 +279,17 @@ void testRestore(void)
     testdbCleanup();
 }
 
-struct dset6 {
-    dset common;
-    DEVSUPFUN proc;
-    DEVSUPFUN linconv;
+static long write_ao(struct aoRecord *prec) {return 0;}
+static long read_wf(struct waveformRecord *prec) {return 0;}
+
+static struct aodset devAOasTest = {
+    {6, NULL, NULL, initRecAO, NULL},
+    write_ao, NULL
+};
+static struct wfdset devWFasTest = {
+    {5, NULL, NULL, initRecWF, NULL},
+    read_wf
 };
-
-static long noop() {return 0;}
-
-static struct dset6 devAOasTest = { {6, NULL, NULL, (DEVSUPFUN)initRec0, NULL}, (DEVSUPFUN)noop, NULL};
-static struct dset6 devWFasTest = { {6, NULL, NULL, (DEVSUPFUN)initRec1, NULL}, (DEVSUPFUN)noop, NULL};
 
 epicsExportAddress(dset, devAOasTest);
 epicsExportAddress(dset, devWFasTest);

modules/database/test/std/rec/asyncproctest.c

@@ -54,7 +54,9 @@ MAIN(asyncproctest)
 
     dbAccessDebugPUTF = 1;
 
+    eltc(0);
     testIocInitOk();
+    eltc(1);
     testDiag("===== Chain 1 ======");
 
     waitFor = 2;

modules/database/test/std/rec/epicsExportTestMain.c

@@ -12,6 +12,7 @@
 #include <epicsUnitTest.h>
 #include <dbUnitTest.h>
 #include <testMain.h>
+#include <errlog.h>
 #include <dbAccess.h>
 #include <iocsh.h>
 #include <epicsExport.h>
@@ -51,7 +52,9 @@ MAIN(epicsExportTest)
 
     testDiag("Testing if dsets and functions are found");
     testdbReadDatabase("epicsExportTest.db", 0, 0);
+    eltc(0);
     testIocInitOk();
+    eltc(1);
 
     testDiag("Testing if dsets work correctly");
     testdbGetFieldEqual("li1", DBF_LONG, -1);

modules/database/test/std/rec/scanEventTest.c

@@ -14,6 +14,7 @@
 #include "dbAccessDefs.h"
 #include "dbUnitTest.h"
 #include "testMain.h"
+#include "errlog.h"
 #include "osiFileName.h"
 #include "epicsThread.h"
 #include "dbScan.h"
@@ -79,7 +80,9 @@ MAIN(scanEventTest)
         sprintf(substitutions, "N=%d,EVENT=%s", i, events[i].name);
         testdbReadDatabase("scanEventTest.db", NULL, substitutions);
     }
+    eltc(0);
     testIocInitOk();
+    eltc(1);
     testDiag("Test if eventNameToHandle() strips spaces and handles numeric events");
     for (i = 0; i < NELEMENTS(events); i++) {
         EVENTPVT pev = eventNameToHandle(events[i].name);

modules/database/test/std/rec/subproctest.c

@@ -10,6 +10,7 @@
  */
 
 #include <testMain.h>
+#include "errlog.h"
 #include <dbUnitTest.h>
 #include <dbAccess.h>
 #include <iocsh.h>
@@ -36,7 +37,9 @@ MAIN(subproctest)
     registryFunctionAdd("subproc", (REGISTRYFUNCTION) subproc);
     testdbReadDatabase("subproctest.db", NULL, "TPRO=0");
 
+    eltc(0);
     testIocInitOk();
+    eltc(1);
     testDiag("===== Test that invalid link in INPA field fails a put request ======");
 
     testdbPutFieldFail(-1, "InvalidINPARec.PROC", DBF_LONG, 1);