Skip to content
Snippets Groups Projects
Commit db9a8ae3 authored by benjamin.franksen's avatar benjamin.franksen
Browse files

make tests run properly under base-3.15

parent bb6cca51
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,8 @@ ifdef T_A ...@@ -25,7 +25,8 @@ ifdef T_A
-include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE -include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE
endif 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) ECHO := $(if $(findstring s,$(MAKEFLAGS)),$(NOP),@echo)
......
...@@ -94,7 +94,11 @@ vxTestHarness_DBD += $(COMMON_DIR)/vxTestHarnessRegistrars.dbd ...@@ -94,7 +94,11 @@ vxTestHarness_DBD += $(COMMON_DIR)/vxTestHarnessRegistrars.dbd
USR_DBDFLAGS += -I $(COMMON_DIR) USR_DBDFLAGS += -I $(COMMON_DIR)
TOUCH = $(PERL) -MExtUtils::Command -e touch
DB += vxTestHarness.db DB += vxTestHarness.db
vxTestHarness.db$(DEP):
$(TOUCH) $@
endif endif
# PROD_RTEMS = rtemsTestHarness # PROD_RTEMS = rtemsTestHarness
......
record(event,"ushort") { # this record's VAL field should be of type DBF_USHORT
record(permissive,"ushort") {
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment