epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

epicsLoadTest use INSTALL_LOCATION

Browse Source
This commit is contained in:
Michael Davidsaver
2021-03-11 08:09:34 -08:00
parent 436a5e7fa2
commit f30e9533c4
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/libcom/test/Makefile
View File

@ -337,3 +337,10 @@ include $(TOP)/configure/RULES
rtemsTestData.c : $(TESTFILES) $(TOOLS)/epicsMakeMemFs.pl rtemsTestData.c : $(TESTFILES) $(TOOLS)/epicsMakeMemFs.pl
$(PERL) $(TOOLS)/epicsMakeMemFs.pl $@ epicsRtemsFSImage $(TESTFILES) $(PERL) $(TOOLS)/epicsMakeMemFs.pl $@ epicsRtemsFSImage $(TESTFILES)
epicsLoadTest$(DEP): epicsInstallDir.h
# use INSTALL_LOCATION instead of FINAL_LOCATION since test executables are not installed.
epicsInstallDir.h: $(TOP)/configure/CONFIG_SITE*
$(ECHO) "INSTALL_LOCATION=$(INSTALL_LOCATION)"
$(PERL) $(TOP)/modules/database/src/std/softIoc/makeInstallDir.pl "$(INSTALL_LOCATION)" > $@

6
modules/libcom/test/epicsLoadTest.cpp
View File

@ -16,6 +16,8 @@
#include "epicsFindSymbol.h" #include "epicsFindSymbol.h"
#include "epicsThread.h" #include "epicsThread.h"
#include "epicsInstallDir.h"
namespace { namespace {
void loadBad() void loadBad()
@ -52,9 +54,9 @@ void loadCA()
std::ostringstream strm; std::ostringstream strm;
// running in eg. modules/libcom/test/O.linux-x86_64-debug // running in eg. modules/libcom/test/O.linux-x86_64-debug
#ifdef _WIN32 #ifdef _WIN32
strm<<"..\\..\\..\\..\\bin\\"<<envGetConfigParamPtr(&EPICS_BUILD_TARGET_ARCH)<<"\\ca.dll"; strm<<EPICS_BASE "\\bin\\"<<envGetConfigParamPtr(&EPICS_BUILD_TARGET_ARCH)<<"\\ca.dll";
#else #else
strm<<"../../../../lib/"<<envGetConfigParamPtr(&EPICS_BUILD_TARGET_ARCH)<<"/"; strm<<EPICS_BASE "/lib/"<<envGetConfigParamPtr(&EPICS_BUILD_TARGET_ARCH)<<"/";
# ifdef __APPLE__ # ifdef __APPLE__
strm<<"libca.dylib"; strm<<"libca.dylib";
# else # else