[TRE] Simplify code with range-based loops and std::find.

[oota-llvm.git] / utils / llvm-lit / llvm-lit.in

diff --git a/utils/llvm-lit/llvm-lit.in b/utils/llvm-lit/llvm-lit.in
index 4c836c88d935d450c699675e8d9f07e26d51feb3..fc962021d7373599a8fcccd4d869c01f14b8b3c3 100755 (executable)
--- a/utils/llvm-lit/llvm-lit.in
+++ b/utils/llvm-lit/llvm-lit.in
@@ -13,7 +13,7 @@ sys.path.insert(0, os.path.join(llvm_source_root, 'utils', 'lit'))
 # Set up some builtin parameters, so that by default the LLVM test suite
 # configuration file knows how to find the object tree.
 builtin_parameters = {
-    'build_mode' : "@CMAKE_CFG_INTDIR@",
+    'build_mode' : "@BUILD_MODE@",
     'llvm_site_config' : os.path.join(llvm_obj_root, 'test', 'lit.site.cfg'),
     'llvm_unit_site_config' : os.path.join(llvm_obj_root, 'test', 'Unit',
                                            'lit.site.cfg')
@@ -29,6 +29,16 @@ if os.path.exists(clang_obj_root):
         builtin_parameters['clang_tools_extra_site_config'] = \
             os.path.join(clang_tools_extra_obj_root, 'test', 'lit.site.cfg')
 
+lld_obj_root = os.path.join(llvm_obj_root, 'tools', 'lld')
+if os.path.exists(lld_obj_root):
+    builtin_parameters['lld_site_config'] = \
+        os.path.join(lld_obj_root, 'test', 'lit.site.cfg')
+
+compilerrt_obj_root = os.path.join(llvm_obj_root, 'projects', 'compiler-rt')
+if os.path.exists(compilerrt_obj_root):
+    builtin_parameters['compilerrt_site_basedir'] = \
+            os.path.join(compilerrt_obj_root, 'test')
+
 if __name__=='__main__':
     import lit
     lit.main(builtin_parameters)