epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

testCa: Use the softIoc's built-in exit subrecord

Browse Source
This commit is contained in:
Andrew Johnson
2018-05-27 00:33:18 -04:00
parent 872004f75f
commit db15689e1c
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
testCa/testCaProvider.cpp
View File

@@ -709,7 +709,7 @@ void TestIoc::run()
char * arch;
arch = getenv("EPICS_HOST_ARCH");
if(arch==NULL) throw std::runtime_error("TestIoc::run $$EPICS_HOST_ARCH not defined");
if(system("$EPICS_BASE/bin/$EPICS_HOST_ARCH/softIoc -d ../testCaProvider.db")!=0) {
if(system("$EPICS_BASE/bin/$EPICS_HOST_ARCH/softIoc -x test -d ../testCaProvider.db")!=0) {
string message(base);
message += "/bin/";
message += arch;
@@ -830,7 +830,7 @@ MAIN(testCaProvider)
client->stopEvents();
#ifndef USE_DBUNITTEST
// put to record that makes IOC exit
channelName = "DBRexit";
channelName = "test:exit";
client = TestClient::create(channelName,pvRequest);
if(!client) throw std::runtime_error(channelName + " client null");
client->put("1");

6
testCa/testCaProvider.db
View File

@@ -39,12 +39,6 @@ record(calc, "DBRcalcin")
field(LLSV, "MAJOR")
}
record(sub, "DBRexit")
{
field(DESC, "exit")
field(SNAM, "exit")
}
record(longin,"DBRlongin") {
field(DESC, "longin")
field(EGU, "volts")