Suppress errlog output of expected warning messages.

This commit is contained in:
Andrew Johnson
2014-07-23 16:18:32 -05:00
parent 0bcfbd0ffc
commit 6bdb8f911a
4 changed files with 10 additions and 0 deletions

View File

@@ -21,6 +21,7 @@
#include "epicsUnitTest.h"
#include "testMain.h"
#include "osiFileName.h"
#include "errlog.h"
/* Expected call bit definitions */
#define e_start 0x00000001
@@ -199,7 +200,9 @@ MAIN(testDbChannel) /* dbChannelTest is an API routine... */
testOk(!dbChannelCreate("y"), "Create, bad record");
testOk(!dbChannelCreate("x.NOFIELD"), "Create, bad field");
testOk(!dbChannelCreate("x.{not-json}"), "Create, bad JSON");
eltc(0);
testOk(!dbChannelCreate("x.{\"none\":null}"), "Create, bad filter");
eltc(1);
dbRegisterFilter("any", &testIf, NULL);

View File

@@ -22,6 +22,7 @@
#include "dbStaticLib.h"
#include "osiFileName.h"
#include "dbmf.h"
#include "errlog.h"
#include "xRecord.h"
@@ -62,7 +63,9 @@ static void testSet(void)
testdbReadDatabase("dbPutLinkTest.db", NULL, NULL);
eltc(0);
testIocInitOk();
eltc(1);
prec = (xRecord*)testdbRecordPtr("x1");
plink = &prec->lnk;

View File

@@ -20,6 +20,7 @@
#include "dbStaticLib.h"
#include "osiFileName.h"
#include "dbmf.h"
#include "errlog.h"
#include "testMain.h"
@@ -72,7 +73,9 @@ void cycle(void) {
testdbReadDatabase("xRecord.db", NULL, NULL);
eltc(0);
testIocInitOk();
eltc(1);
epicsThreadMap(findCommonThread);
checkCommonThreads();

View File

@@ -368,6 +368,7 @@ epicsShareFunc int epicsShareAPI errlogRemoveListeners(
epicsShareFunc int epicsShareAPI eltc(int yesno)
{
errlogInit(0);
errlogFlush();
pvtData.toConsole = yesno;
return 0;
}