jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix DLL tests on POSIX

Browse source 
Automatically add the lib directory to LD_LIBRARY_PATH temporarily
This commit is contained in:
def 2015-03-10 15:35:36 +01:00
commit ac0f62084c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/testament/categories.nim
View file

@ -86,9 +86,9 @@ proc runBasicDLLTest(c, r: var TResults, cat: Category, options: string) =
safeCopyFile("lib" / nimrtlDll, "tests/dll" / nimrtlDll) safeCopyFile("lib" / nimrtlDll, "tests/dll" / nimrtlDll)
else: else:
# posix relies on crappy LD_LIBRARY_PATH (ugh!): # posix relies on crappy LD_LIBRARY_PATH (ugh!):
var libpath = getenv"LD_LIBRARY_PATH".string var libpath = getEnv"LD_LIBRARY_PATH".string
if peg"\i '/nim' (!'/')* '/lib'" notin libpath: # Temporarily add the lib directory to LD_LIBRARY_PATH:
echo "[Warning] insufficient LD_LIBRARY_PATH" putEnv("LD_LIBRARY_PATH", "lib:" & libpath)
var serverDll = DynlibFormat % "server" var serverDll = DynlibFormat % "server"
safeCopyFile("tests/dll" / serverDll, "lib" / serverDll) safeCopyFile("tests/dll" / serverDll, "lib" / serverDll)