Skip to content

Commit

Permalink
arrayOpTest: remove checks on dbAddr::pfield
Browse files Browse the repository at this point in the history
  • Loading branch information
mdavidsaver committed Apr 9, 2021
1 parent 8a7d678 commit 00db961
Showing 1 changed file with 2 additions and 19 deletions.
21 changes: 2 additions & 19 deletions modules/database/test/std/rec/arrayOpTest.c
Expand Up @@ -23,7 +23,7 @@ void recTestIoc_registerRecordDeviceDriver(struct dbBase *);
static void testGetPutArray(void)
{
double data[4] = {11, 12, 13, 14};
DBADDR addr, save;
DBADDR addr;
long nreq;
epicsInt32 *pbtr;
waveformRecord *prec;
Expand All @@ -45,7 +45,6 @@ static void testGetPutArray(void)
prec = (waveformRecord*)testdbRecordPtr("wfrec");
if(!prec || dbNameToAddr("wfrec", &addr))
testAbort("Failed to find record wfrec");
memcpy(&save, &addr, sizeof(save));

testDiag("Fetch initial value of %s", prec->name);

Expand All @@ -62,9 +61,6 @@ static void testGetPutArray(void)
}
dbScanUnlock(addr.precord);

testOk1(memcmp(&addr, &save, sizeof(save))==0);
addr=save;

testDiag("Write a new value");

data[0] = 4.0;
Expand All @@ -79,9 +75,6 @@ static void testGetPutArray(void)
testOk1(pbtr[0]==4 && pbtr[1]==5 && pbtr[2]==6 && pbtr[3]==7);
dbScanUnlock(addr.precord);

testOk1(memcmp(&addr, &save, sizeof(save))==0);
addr=save;

memset(&data, 0, sizeof(data));

testDiag("Reread the value");
Expand All @@ -96,14 +89,11 @@ static void testGetPutArray(void)
}
dbScanUnlock(addr.precord);

testOk1(memcmp(&addr, &save, sizeof(save))==0);

testDiag("Test dbGet() and dbPut() from/to an array of size 1");

prec = (waveformRecord*)testdbRecordPtr("wfrec1");
if(!prec || dbNameToAddr("wfrec1", &addr))
testAbort("Failed to find record wfrec1");
memcpy(&save, &addr, sizeof(save));

testDiag("Fetch initial value of %s", prec->name);

Expand All @@ -118,9 +108,6 @@ static void testGetPutArray(void)
}
dbScanUnlock(addr.precord);

testOk1(memcmp(&addr, &save, sizeof(save))==0);
addr=save;

testDiag("Write a new value");

data[0] = 4.0;
Expand All @@ -135,9 +122,6 @@ static void testGetPutArray(void)
testOk1(pbtr[0]==4);
dbScanUnlock(addr.precord);

testOk1(memcmp(&addr, &save, sizeof(save))==0);
addr=save;

memset(&data, 0, sizeof(data));

testDiag("Reread the value");
Expand All @@ -152,7 +136,6 @@ static void testGetPutArray(void)
}
dbScanUnlock(addr.precord);

testOk1(memcmp(&addr, &save, sizeof(save))==0);

testIocShutdownOk();

Expand All @@ -161,7 +144,7 @@ static void testGetPutArray(void)

MAIN(arrayOpTest)
{
testPlan(21);
testPlan(15);
testGetPutArray();
return testDone();
}

0 comments on commit 00db961

Please sign in to comment.