X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FUnit%2Flit.cfg;h=15cf626c72bf9f3a8de6311c9a62b9fde38325f6;hb=fc699872e35ec794d7373680be6f1946fe8e9ca6;hp=8321593cf715c76faa6761545bcb0db9b1b05c65;hpb=fb4fb6ddb0f26ad0269a93f2edc8baa490984122;p=oota-llvm.git

diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
index 8321593cf71..15cf626c72b 100644
--- a/test/Unit/lit.cfg
+++ b/test/Unit/lit.cfg
@@ -21,9 +21,19 @@ 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
+# Propagate path to symbolizer for ASan/MSan.
+for symbolizer in ['ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH']:
+    if symbolizer in os.environ:
+        config.environment[symbolizer] = os.environ[symbolizer]
+
+###
 
 # Check that the object root is known.
 if config.test_exec_root is None:
@@ -32,6 +42,12 @@ if config.test_exec_root is None:
     # configuration hasn't been created by the build system, or we are in an
     # out-of-tree build situation).
 
+    # Check for 'llvm_unit_site_config' user parameter, and use that if available.
+    site_cfg = lit.params.get('llvm_unit_site_config', None)
+    if site_cfg and os.path.exists(site_cfg):
+        lit.load_config(config, site_cfg)
+        raise SystemExit
+
     # Try to detect the situation where we are using an out-of-tree build by
     # looking for 'llvm-config'.
     #
@@ -62,3 +78,11 @@ if config.test_exec_root is None:
     lit.note('using out-of-tree build at %r' % llvm_obj_root)
     lit.load_config(config, site_cfg)
     raise SystemExit
+
+# 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