X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Flit.cfg;h=3ba4c993ef64a3100abe14612d788baa2bf4c981;hb=689cf3cb6222652b92fdbd52e96c1d2f421ac44e;hp=65e0dc7ea0d63e27b71ba50f8d648fcfb49a1b40;hpb=9b2cb695b38f0a33d7559639c265821ae74b97dc;p=oota-llvm.git

diff --git a/test/lit.cfg b/test/lit.cfg
index 65e0dc7ea0d..3ba4c993ef6 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -45,13 +45,22 @@ if llvm_obj_root is not None:
                                      config.environment['PATH']))
         config.environment['PATH'] = path
 
-# Propogate 'HOME' through the environment.
-config.environment['HOME'] = os.environ['HOME']
+# Propagate 'HOME' through the environment.
+if 'HOME' in os.environ:
+    config.environment['HOME'] = os.environ['HOME']
 
-# Propogate LLVM_SRC_ROOT into the environment.
-config.environment['LLVM_SRC_ROOT'] = config.llvm_src_root
+# Propagate 'INCLUDE' through the environment.
+if 'INCLUDE' in os.environ:
+    config.environment['INCLUDE'] = os.environ['INCLUDE']
 
-# Propogate PYTHON_EXEUTABLE into the environment
+# Propagate 'LIB' through the environment.
+if 'LIB' in os.environ:
+    config.environment['LIB'] = os.environ['LIB']
+
+# Propagate LLVM_SRC_ROOT into the environment.
+config.environment['LLVM_SRC_ROOT'] = getattr(config, 'llvm_src_root', '')
+
+# Propagate PYTHON_EXECUTABLE into the environment
 config.environment['PYTHON_EXECUTABLE'] = getattr(config, 'python_executable',
                                                   '')
 
@@ -110,7 +119,7 @@ import re
 site_exp = {}
 # FIXME: Implement lit.site.cfg.
 for line in open(os.path.join(config.llvm_obj_root, 'test', 'site.exp')):
-    m = re.match('set ([^ ]+) "([^"]*)"', line)
+    m = re.match('set ([^ ]+) "(.*)"', line)
     if m:
         site_exp[m.group(1)] = m.group(2)
 
@@ -147,13 +156,13 @@ def llvm_supports_target(name):
 def llvm_supports_darwin_and_target(name):
     return 'darwin' in config.target_triple and llvm_supports_target(name)
 
-langs = set(site_exp['llvmgcc_langs'].split(','))
+langs = set([s.strip() for s in site_exp['llvmgcc_langs'].split(',')])
 def llvm_gcc_supports(name):
-    return name in langs
+    return name.strip() in langs
 
-bindings = set(site_exp['llvm_bindings'].split(','))
+bindings = set([s.strip() for s in site_exp['llvm_bindings'].split(',')])
 def llvm_supports_binding(name):
-    return name in bindings
+    return name.strip() in bindings
 
 # Provide on_clone hook for reading 'dg.exp'.
 import os