From 40b327cfcb2151c3851f76001a14cee2858c0455 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Fri, 12 Mar 2021 11:17:33 -0800
Subject: [PATCH] testpvif 3.15 compat

---
 testApp/testfilters.db |  5 +----
 testApp/testpvif.cpp   | 13 ++++++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/testApp/testfilters.db b/testApp/testfilters.db
index 18b3753..1c1d9c6 100644
--- a/testApp/testfilters.db
+++ b/testApp/testfilters.db
@@ -1,7 +1,4 @@
-record (aai, "TEST") {
+record (waveform, "TEST") {
 field(FTVL, "SHORT")
 field(NELM, "10")
-field(INP, [9,8,7,6,5,4,3,2,1])
-field(PINI, "YES")
-info(test, "Hello World")
 }
diff --git a/testApp/testpvif.cpp b/testApp/testpvif.cpp
index c0c9973..d08120d 100644
--- a/testApp/testpvif.cpp
+++ b/testApp/testpvif.cpp
@@ -550,6 +550,10 @@ void testFilters()
 {
     testDiag("testFilter");
 
+#if EPICS_VERSION_INT < VERSION_INT(7, 0, 0, 0)
+    testSkip(5, "Needs Base >=7.0");
+#else
+
     TestIOC IOC;
 
     testdbReadDatabase("p2pTestIoc.dbd", NULL, NULL);
@@ -558,9 +562,10 @@ void testFilters()
 
     IOC.init();
 
-    dbCommon *prec =  testdbRecordPtr("TEST");
-#if EPICS_VERSION_INT > VERSION_INT(7, 0, 5, 0)
     static epicsInt32 arr[] = {9, 8, 7, 6, 5, 4, 3, 2, 1};
+    testdbPutArrFieldOk("TEST", DBF_LONG, 9, arr);
+
+#if EPICS_VERSION_INT > VERSION_INT(7, 0, 5, 0)
     testdbGetArrFieldEqual("TEST", DBF_LONG, 10, 9, arr);
     testdbGetArrFieldEqual("TEST.{arr:{s:5}}", DBF_LONG, 10, 4, arr+5);
 
@@ -593,19 +598,21 @@ void testFilters()
     scratch[4] = 1;
     pvd::shared_vector<const pvd::int16> expected(pvd::freeze(scratch));
 
+    dbCommon *prec =  testdbRecordPtr("TEST");
     dbScanLock(prec);
     pvd::BitSet changed;
     pvif->put(changed, DBE_VALUE, fl.pfl);
     dbScanUnlock(prec);
 
     testFieldEqual<pvd::PVShortArray>(root, "dut.value", expected);
+#endif // >= 7.0
 }
 
 } // namespace
 
 MAIN(testpvif)
 {
-    testPlan(79
+    testPlan(80
 #ifdef USE_INT64
              +13
 #endif