Minor cleanup related to my latest scheduler changes.

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

diff --git a/test/lit.cfg b/test/lit.cfg
index e65b8bec9e4e3caa1b800a1ed91ca52ccc796708..98f72092e3121d71037e6a5ace6d1f3e24739a7e 100644 (file)
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -3,6 +3,7 @@
 # Configuration file for the 'lit' test runner.
 
 import os
+import sys
 
 # name: The name of this test suite.
 config.name = 'LLVM'
@@ -45,8 +46,31 @@ 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']
+
+# Propagate 'INCLUDE' through the environment.
+if 'INCLUDE' in os.environ:
+    config.environment['INCLUDE'] = os.environ['INCLUDE']
+
+# Propagate 'LIB' through the environment.
+if 'LIB' in os.environ:
+    config.environment['LIB'] = os.environ['LIB']
+
+# 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']
+
+# 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',
+                                                  '')
 
 ###
 
@@ -103,18 +127,19 @@ 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)
 
 # Add substitutions.
 config.substitutions.append(('%llvmgcc_only', site_exp['llvmgcc']))
-for sub in ['llvmgcc', 'llvmgxx', 'compile_cxx', 'compile_c',
+for sub in ['llvmgcc', 'llvmgxx', 'emitir', 'compile_cxx', 'compile_c',
             'link', 'shlibext', 'ocamlopt', 'llvmdsymutil', 'llvmlibsdir',
+            'llvmshlibdir',
             'bugpoint_topts']:
     if sub in ('llvmgcc', 'llvmgxx'):
         config.substitutions.append(('%' + sub,
-                                     site_exp[sub] + ' -emit-llvm -w'))
+                                     site_exp[sub] + ' %emitir -w'))
     # FIXME: This is a hack to avoid LLVMC tests failing due to a clang driver
     #        warning when passing in "-fexceptions -fno-exceptions".
     elif sub == 'compile_cxx':
@@ -128,10 +153,9 @@ excludes = []
 # Provide target_triple for use in XFAIL and XTARGET.
 config.target_triple = site_exp['target_triplet']
 
-# When running under valgrind, we mangle '-vg' onto the end of the triple so we
-# can check it with XFAIL and XTARGET.
-if lit.useValgrind:
-    config.target_triple += '-vg'
+# When running under valgrind, we mangle '-vg' or '-vg_leak' onto the end of the
+# triple so we can check it with XFAIL and XTARGET.
+config.target_triple += lit.valgrindTriple
 
 # Provide llvm_supports_target for use in local configs.
 targets = set(site_exp["TARGETS_TO_BUILD"].split())
@@ -141,13 +165,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
@@ -199,3 +223,19 @@ def on_clone(parent, cfg, for_path):
     lit.error('unable to understand %r:\n%s' % (libPath, lib))
 
 config.on_clone = on_clone
+
+### Features
+
+# Shell execution
+if sys.platform not in ['win32']:
+    config.available_features.add('shell')
+
+# Loadable module
+# FIXME: This should be supplied by Makefile or autoconf.
+if sys.platform in ['win32', 'cygwin']:
+    loadable_module = (config.enable_shared == 1)
+else:
+    loadable_module = True
+
+if loadable_module:
+    config.available_features.add('loadable_module')