Skip to content

Added macros for system tests for macro defaults #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added macros for system tests for macro defaults #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions iocBoot/iocsimple/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,10 @@
<ioc_config xmlns:xi="http://www.w3.org/2001/XInclude">
<config_part>
<ioc_desc>ISIS IBEX Basic IOC providing some PVs for some simple data types</ioc_desc>
<macros>
<macro name="MACRO1" pattern="^[0-9]+$" description="A macro without a default" hasDefault="No"/>
<macro name="MACRO2" pattern="^[0-9]+$" description="A macro with a default of 5" hasDefault="YES" defaultValue="5"/>
<macro name="MACRO3" pattern="^[0-9]+$" description="A macro with a default of ''" hasDefault="YES" defaultValue=""/>
</macros>
</config_part>
</ioc_config>
6 changes: 6 additions & 0 deletions iocBoot/iocsimple/st.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ simple_registerRecordDeviceDriver pdbbase
dbLoadRecords("db/simple.db","P=$(MYPVPREFIX)SIMPLE:")
dbLoadRecords("db/channel_access_test.db","P=$(MYPVPREFIX)SIMPLE:")

## db's to test macro defaults, dbload failures on these can be freely ignored.
dbLoadRecords("db/simple_macrotest1.db","P=$(MYPVPREFIX)SIMPLE:,MACRO1=$(MACRO1)")
dbLoadRecords("db/simple_macrotest2.db","P=$(MYPVPREFIX)SIMPLE:,MACRO2=$(MACRO2)")
dbLoadRecords("db/simple_macrotest3.db","P=$(MYPVPREFIX)SIMPLE:,MACRO3=$(MACRO3)")


< $(IOCSTARTUP)/preiocinit.cmd

cd ${TOP}/iocBoot/${IOC}
Expand Down
3 changes: 3 additions & 0 deletions simpleApp/Db/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ include $(TOP)/configure/CONFIG
# Create and install (or just install) into <top>/db
# databases, templates, substitutions like this
DB += simple.db channel_access_test.db
DB += simple_macrotest1.db
DB += simple_macrotest2.db
DB += simple_macrotest3.db

#----------------------------------------------------
# If <anyname>.db template is not named <anyname>*.template add
Expand Down
5 changes: 5 additions & 0 deletions simpleApp/Db/simple_macrotest1.db
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
record(stringout, $(P)MACROTEST1)
{
field(DESC, "Macro for a value")
field(VAL, "$(MACRO1)")
}
5 changes: 5 additions & 0 deletions simpleApp/Db/simple_macrotest2.db
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
record(stringout, $(P)MACROTEST2)
{
field(DESC, "Macro default of 5 for a value")
field(VAL, "$(MACRO2)")
}
5 changes: 5 additions & 0 deletions simpleApp/Db/simple_macrotest3.db
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
record(stringout, $(P)MACROTEST3)
{
field(DESC, "Macro default of '' for a value")
field(VAL, "$(MACRO3)")
}