X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FUnit%2Flit.cfg;h=35092964a5cd2a45b1e8f1893145db71566df7ac;hb=1518afddea6c0a4275a9ac64a9ffe2b6b4c0600a;hp=34372bb6cbe9381c519c0f96f9ccdb512b75f8a8;hpb=407fbdd161d4134901fefe267779a4aaaeab2f0d;p=oota-llvm.git

diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
index 34372bb6cbe..35092964a5c 100644
--- a/test/Unit/lit.cfg
+++ b/test/Unit/lit.cfg
@@ -21,9 +21,22 @@ if llvm_obj_root is not None:
 llvm_build_mode = getattr(config, 'llvm_build_mode', "Debug")
 config.test_format = lit.formats.GoogleTest(llvm_build_mode, 'Tests')
 
+# Propagate the temp directory. Windows requires this because it uses \Windows\
+# if none of these are present.
+if 'TMP' in os.environ:
+    config.environment['TMP'] = os.environ['TMP']
+if 'TEMP' in os.environ:
+    config.environment['TEMP'] = os.environ['TEMP']
+
 ###
 
-import os
+# If necessary, point the dynamic loader at libLLVM.so.
+if config.enable_shared:
+    shlibpath = config.environment.get(config.shlibpath_var,'')
+    if shlibpath:
+        shlibpath = os.pathsep + shlibpath
+    shlibpath = config.shlibdir + shlibpath
+    config.environment[config.shlibpath_var] = shlibpath
 
 # Check that the object root is known.
 if config.test_exec_root is None: