From db9a8ae3f0926c29215afbb086d15854060822f8 Mon Sep 17 00:00:00 2001
From: "benjamin.franksen" <benjamin.franksen@helmholtz-berlin.de>
Date: Tue, 15 Jan 2013 09:11:19 +0000
Subject: [PATCH] make tests run properly under base-3.15
---
configure/CONFIG | 3 ++-
test/validate/Makefile | 4 ++++
test/validate/bittypes.db | 3 ++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/configure/CONFIG b/configure/CONFIG
index 0f7617b9..a641a8f3 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -25,7 +25,8 @@ ifdef T_A
-include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE
endif
-EPICS_HAS_UNIT_TEST := $(shell $(PERL) -e 'print($(EPICS_MODIFICATION) >= 10)')
+EPICS_HAS_UNIT_TEST := $(shell $(PERL) -e\
+ 'print($(EPICS_REVISION) > 14 || ($(EPICS_REVISION) == 14 && $(EPICS_MODIFICATION) >= 10))')
ECHO := $(if $(findstring s,$(MAKEFLAGS)),$(NOP),@echo)
diff --git a/test/validate/Makefile b/test/validate/Makefile
index a992a5a3..536cf94f 100644
--- a/test/validate/Makefile
+++ b/test/validate/Makefile
@@ -94,7 +94,11 @@ vxTestHarness_DBD += $(COMMON_DIR)/vxTestHarnessRegistrars.dbd
USR_DBDFLAGS += -I $(COMMON_DIR)
+TOUCH = $(PERL) -MExtUtils::Command -e touch
+
DB += vxTestHarness.db
+vxTestHarness.db$(DEP):
+ $(TOUCH) $@
endif
# PROD_RTEMS = rtemsTestHarness
diff --git a/test/validate/bittypes.db b/test/validate/bittypes.db
index 13aa1bb3..9fc1edd2 100644
--- a/test/validate/bittypes.db
+++ b/test/validate/bittypes.db
@@ -1,2 +1,3 @@
-record(event,"ushort") {
+# this record's VAL field should be of type DBF_USHORT
+record(permissive,"ushort") {
}
--
GitLab