Another test that uses -m64. Here too it looks like it can be

[oota-llvm.git] / test / lit.cfg

diff --git a/test/lit.cfg b/test/lit.cfg
index 9500aae8948e0bef1c5dc20b0625248abb88a6da..f15777c99912e1e19cea4ca909e79e0f2c3f3bef 100644 (file)
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -49,6 +49,14 @@ if llvm_obj_root is not None:
 if 'HOME' in os.environ:
     config.environment['HOME'] = os.environ['HOME']
 
+# Propogate 'INCLUDE' through the environment.
+if 'INCLUDE' in os.environ:
+    config.environment['INCLUDE'] = os.environ['INCLUDE']
+
+# Propogate 'LIB' through the environment.
+if 'LIB' in os.environ:
+    config.environment['LIB'] = os.environ['LIB']
+
 # Propogate LLVM_SRC_ROOT into the environment.
 config.environment['LLVM_SRC_ROOT'] = getattr(config, 'llvm_src_root', '')
 
@@ -111,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)