X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Flit.cfg;h=98f72092e3121d71037e6a5ace6d1f3e24739a7e;hb=b3898af89fb4cb8146076e1a8e0bd5ecea4f5944;hp=28f336ba20c556cd7d3eb6e63235a6733a322e40;hpb=8d854a4f7e790fafb72640f093f6f15f49fe5e70;p=oota-llvm.git

diff --git a/test/lit.cfg b/test/lit.cfg
index 28f336ba20c..98f72092e31 100644
--- 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,14 +46,29 @@ if llvm_obj_root is not None:
                                      config.environment['PATH']))
         config.environment['PATH'] = path
 
-# Propogate 'HOME' through the environment.
+# Propagate 'HOME' through the environment.
 if 'HOME' in os.environ:
     config.environment['HOME'] = os.environ['HOME']
 
-# Propogate LLVM_SRC_ROOT into the environment.
+# 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', '')
 
-# Propogate PYTHON_EXEUTABLE into the environment
+# Propagate PYTHON_EXECUTABLE into the environment
 config.environment['PYTHON_EXECUTABLE'] = getattr(config, 'python_executable',
                                                   '')
 
@@ -117,12 +133,13 @@ for line in open(os.path.join(config.llvm_obj_root, 'test', 'site.exp')):
 
 # 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':
@@ -206,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')