From 14d3655cf09de43766169a17dcafe29d1d2544f2 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Thu, 21 Sep 2017 17:24:59 -0500
Subject: [PATCH] more 3.15 compat

---
 testApp/testpdb-groups.db | 34 ++++++++++++++++++++++++++++++++++
 testApp/testpdb.cpp       |  3 +++
 testApp/testpdb.db        | 25 -------------------------
 3 files changed, 37 insertions(+), 25 deletions(-)
 create mode 100644 testApp/testpdb-groups.db

diff --git a/testApp/testpdb-groups.db b/testApp/testpdb-groups.db
new file mode 100644
index 0000000..52cbf20
--- /dev/null
+++ b/testApp/testpdb-groups.db
@@ -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")
+}
diff --git a/testApp/testpdb.cpp b/testApp/testpdb.cpp
index 7616d43..f966d61 100644
--- a/testApp/testpdb.cpp
+++ b/testApp/testpdb.cpp
@@ -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();
 
diff --git a/testApp/testpdb.db b/testApp/testpdb.db
index 8e21534..4458653 100644
--- a/testApp/testpdb.db
+++ b/testApp/testpdb.db
@@ -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")
 }