more 3.15 compat

This commit is contained in:
Michael Davidsaver
2017-09-21 17:24:59 -05:00
parent 39970e9670
commit 14d3655cf0
3 changed files with 37 additions and 25 deletions

34
testApp/testpdb-groups.db Normal file
View File

@ -0,0 +1,34 @@
record("*", "rec3") {
info(Q:group, {
"grp1":{
"fld1":{+channel:"VAL"},
"fld2":{+channel:"RVAL"}
}
})
}
record("*", "rec4") {
info(Q:group, {
"grp1":{
"fld3":{+channel:"VAL"},
"fld4":{+channel:"RVAL"}
}
})
}
record("*", "rec5") {
info(Q:group, {
"grp2":{
"fld1":{+channel:"VAL"},
"fld3":{+channel:"RVAL"}
}
})
}
record("*", "rec6") {
info(Q:group, {
"grp2":{
"fld2":{+channel:"VAL", +trigger:"fld1,fld2"}
}
})
info(pdbGroup, "grp2|fld2=VAL")
info(pdbTrigger, "grp2|fld2>fld1,fld2")
}

View File

@ -435,6 +435,9 @@ MAIN(testpdb)
testdbReadDatabase("p2pTestIoc.dbd", NULL, NULL);
p2pTestIoc_registerRecordDeviceDriver(pdbbase);
testdbReadDatabase("testpdb.db", NULL, NULL);
#ifdef USE_MULTILOCK
testdbReadDatabase("testpdb-groups.db", NULL, NULL);
#endif
IOC.init();

View File

@ -13,42 +13,17 @@ record(ai, "rec3") {
field(RVAL, "30")
field(HOPR, "200")
field(LOPR, "-200")
info(Q:group, {
"grp1":{
"fld1":{+channel:"VAL"},
"fld2":{+channel:"RVAL"}
}
})
}
record(ai, "rec4") {
field(VAL, "4.0")
field(RVAL, "40")
info(Q:group, {
"grp1":{
"fld3":{+channel:"VAL"},
"fld4":{+channel:"RVAL"}
}
})
}
record(ai, "rec5") {
field(VAL, "5.0")
field(RVAL, "50")
info(Q:group, {
"grp2":{
"fld1":{+channel:"VAL"},
"fld3":{+channel:"RVAL"}
}
})
}
record(ai, "rec6") {
field(VAL, "6.0")
field(RVAL, "60")
info(Q:group, {
"grp2":{
"fld2":{+channel:"VAL", +trigger:"fld1,fld2"}
}
})
info(pdbGroup, "grp2|fld2=VAL")
info(pdbTrigger, "grp2|fld2>fld1,fld2")
}