From db15689e1cc159286045c44d55e8ebbdc80e4eb3 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sun, 27 May 2018 00:33:18 -0400 Subject: [PATCH] testCa: Use the softIoc's built-in exit subrecord --- testCa/testCaProvider.cpp | 4 ++-- testCa/testCaProvider.db | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/testCa/testCaProvider.cpp b/testCa/testCaProvider.cpp index abd4822..fc1be44 100644 --- a/testCa/testCaProvider.cpp +++ b/testCa/testCaProvider.cpp @@ -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"); diff --git a/testCa/testCaProvider.db b/testCa/testCaProvider.db index 647c0c5..04cdcf7 100644 --- a/testCa/testCaProvider.db +++ b/testCa/testCaProvider.db @@ -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")