[cfe-commits] r81989 - /cfe/trunk/test/lit.cfg

[Daniel Dunbar]

Author: ddunbar
Date: Tue Sep 15 20:39:52 2009
New Revision: 81989

URL: http://llvm.org/viewvc/llvm-project?rev=81989&view=rev
Log:
tests: Stash clang/clang-cc and LLVM src/obj paths for use elsewhere.

Modified:
    cfe/trunk/test/lit.cfg

Modified: cfe/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg?rev=81989&r1=81988&r2=81989&view=diff

==============================================================================
--- cfe/trunk/test/lit.cfg (original)
+++ cfe/trunk/test/lit.cfg Tue Sep 15 20:39:52 2009
@@ -26,6 +26,13 @@
     if clang_obj_root is not None:
         config.test_exec_root = os.path.join(clang_obj_root, 'test')
 
+    # Set llvm_{src,obj}_root for use by others.
+    config.llvm_src_root = os.path.join(config.test_source_root,
+                                        '..', '..', '..')
+    if clang_obj_root is not None:
+        config.llvm_obj_root = os.path.join(clang_obj_root,
+                                            '..', '..')
+
     ###
 
     # Check that the object root is known.
@@ -121,15 +128,15 @@
 
         return clangcc
 
-    clang = inferClang(config.environment['PATH'])
+    config.clang = inferClang(config.environment['PATH'])
     if not lit.quiet:
-        lit.note('using clang: %r' % clang)
-    config.substitutions.append( (' clang ', ' ' + clang + ' ') )
+        lit.note('using clang: %r' % config.clang)
+    config.substitutions.append( (' clang ', ' ' + config.clang + ' ') )
 
-    clang_cc = inferClangCC(clang, config.environment['PATH'])
+    config.clang_cc = inferClangCC(config.clang, config.environment['PATH'])
     if not lit.quiet:
-        lit.note('using clang-cc: %r' % clang_cc)
-    config.substitutions.append( (' clang-cc ', ' ' + clang_cc + ' ') )
+        lit.note('using clang-cc: %r' % config.clang_cc)
+    config.substitutions.append( (' clang-cc ', ' ' + config.clang_cc + ' ') )
 
 if 'config' in globals():
     config_new()