projects
/
oota-llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
302b169
)
test/lit.cfg: Seek sane tools(and bash) in directories and set to $PATH.
author
NAKAMURA Takumi
<geek4civic@gmail.com>
Wed, 9 Feb 2011 04:19:21 +0000
(
04:19
+0000)
committer
NAKAMURA Takumi
<geek4civic@gmail.com>
Wed, 9 Feb 2011 04:19:21 +0000
(
04:19
+0000)
LitConfig.getBashPath() will not seek in $PATH after LitConfig.getToolsPath() was executed.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@125176
91177308
-0d34-0410-b5e6-
96231b3b80d8
test/lit.cfg
patch
|
blob
|
history
diff --git
a/test/lit.cfg
b/test/lit.cfg
index fef6d78902bc541421590ca689d7f1fb382354fc..21b0a48be9f1179aa21b7c5d38c791fa71d4509e 100644
(file)
--- a/
test/lit.cfg
+++ b/
test/lit.cfg
@@
-19,6
+19,18
@@
config.suffixes = []
# test_source_root: The root path where tests are located.
config.test_source_root = os.path.dirname(__file__)
# test_source_root: The root path where tests are located.
config.test_source_root = os.path.dirname(__file__)
+# Tweak PATH for Win32
+if sys.platform in ['win32']:
+ # Seek sane tools in directories and set to $PATH.
+ path = getattr(config, 'lit_tools_dir', None)
+ path = lit.getToolsPath(path,
+ config.environment['PATH'],
+ ['cmp.exe', 'grep.exe', 'sed.exe'])
+ if path is not None:
+ path = os.path.pathsep.join((path,
+ config.environment['PATH']))
+ config.environment['PATH'] = path
+
# test_exec_root: The root path where tests should be run.
llvm_obj_root = getattr(config, 'llvm_obj_root', None)
if llvm_obj_root is not None:
# test_exec_root: The root path where tests should be run.
llvm_obj_root = getattr(config, 'llvm_obj_root', None)
if llvm_obj_root is not None:
@@
-273,7
+285,7
@@
config.on_clone = on_clone
### Features
# Shell execution
### Features
# Shell execution
-if sys.platform not in ['win32']:
+if sys.platform not in ['win32']
or lit.getBashPath() != ''
:
config.available_features.add('shell')
# Loadable module
config.available_features.add('shell')
# Loadable module