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

testCaProvider: Make system(softIoc) OS-independent

Browse Source
This commit is contained in:
Andrew Johnson
2020-04-15 23:30:11 -05:00
committed by mdavidsaver
parent 3ba6679e67
commit 9413d97fd5
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
testCa/testCaProvider.cpp
View File

@@ -27,6 +27,8 @@
#include <dbUnitTest.h>
extern "C" int testIoc_registerRecordDeviceDriver(struct dbBase *pbase);
#else
#include <osiFileName.h>
#endif
#endif
@@ -733,12 +735,14 @@ void TestIoc::run()
// tests with an embedded IOC fail with a Base before 3.16.2.
// This version only works on workstation targets, it runs the
// softIoc from Base as a separate process, using system().
if(system("$EPICS_BASE/bin/$EPICS_HOST_ARCH/softIoc -x test -d ../testCaProvider.db")!=0) {
string message(base);
message += "/bin/";
message += arch;
message += "/softIoc -d ../testCaProvider.db not started";
throw std::runtime_error(message);
string cmd(base);
cmd += OSI_PATH_SEPARATOR "bin" OSI_PATH_SEPARATOR;
cmd += arch;
cmd += OSI_PATH_SEPARATOR "softIoc -x test -d ../testCaProvider.db";
if (system(cmd.c_str()) != 0) {
string message(cmd);
cmd += " not started";
throw std::runtime_error(cmd);
}
#endif
}