From ac0f62084c6869ae1a7905638d60009bb9efd8c8 Mon Sep 17 00:00:00 2001 From: def Date: Tue, 10 Mar 2015 15:35:36 +0100 Subject: [PATCH] Fix DLL tests on POSIX Automatically add the lib directory to LD_LIBRARY_PATH temporarily --- tests/testament/categories.nim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/testament/categories.nim b/tests/testament/categories.nim index 323abd768a..c293be7e82 100644 --- a/tests/testament/categories.nim +++ b/tests/testament/categories.nim @@ -86,9 +86,9 @@ proc runBasicDLLTest(c, r: var TResults, cat: Category, options: string) = safeCopyFile("lib" / nimrtlDll, "tests/dll" / nimrtlDll) else: # posix relies on crappy LD_LIBRARY_PATH (ugh!): - var libpath = getenv"LD_LIBRARY_PATH".string - if peg"\i '/nim' (!'/')* '/lib'" notin libpath: - echo "[Warning] insufficient LD_LIBRARY_PATH" + var libpath = getEnv"LD_LIBRARY_PATH".string + # Temporarily add the lib directory to LD_LIBRARY_PATH: + putEnv("LD_LIBRARY_PATH", "lib:" & libpath) var serverDll = DynlibFormat % "server" safeCopyFile("tests/dll" / serverDll, "lib" / serverDll)