aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-09-16 01:39:52 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-09-16 01:39:52 +0000
commit280aa75eb08c9a50fd4cc60ec781b5b81d9f534e (patch)
tree0edaa9c768bdb797fe689900f4e512de16a36f8b
parentb95519a3835a1fb16c6106c4570066e7693187a5 (diff)
tests: Stash clang/clang-cc and LLVM src/obj paths for use elsewhere.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@81989 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/lit.cfg19
1 files changed, 13 insertions, 6 deletions
diff --git a/test/lit.cfg b/test/lit.cfg
index 0b8e12bf0d..46164f94b1 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -26,6 +26,13 @@ def config_new():
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 @@ def config_new():
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()