diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2012-04-07 01:02:53 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2012-04-07 01:02:53 +0000 |
| commit | 79c5f95f24bdd07962b263362c1aa6716330f43c (patch) | |
| tree | 1bb643fdc10ba4740e44337dd1ce4f38e1c24d1a /test/lit.cfg | |
| parent | a53ab5c569f494e44344ab950ccd6289dfa2d3ef (diff) | |
| download | clang-79c5f95f24bdd07962b263362c1aa6716330f43c.tar.gz | |
test/lit.cfg: Please pass %INCLUDE% to clang.exe on Win32. MS-compatible clang may refer to %INCLUDE%. It fixes r154188.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154240 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/lit.cfg')
| -rw-r--r-- | test/lit.cfg | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/lit.cfg b/test/lit.cfg index 3dee99652c..738dc38e5b 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -59,7 +59,7 @@ config.llvm_obj_root = getattr(config, 'llvm_obj_root', None) # 'IOS_SIMULATOR_DEPLOYMENT_TARGET', # 'VCINSTALLDIR', 'VC100COMNTOOLS', 'VC90COMNTOOLS', # 'VC80COMNTOOLS') -possibly_dangerous_env_vars = ('COMPILER_PATH', 'RC_DEBUG_OPTIONS', 'INCLUDE', +possibly_dangerous_env_vars = ['COMPILER_PATH', 'RC_DEBUG_OPTIONS', 'CINDEXTEST_PREAMBLE_FILE', 'LIBRARY_PATH', 'CPATH', 'C_INCLUDE_PATH', 'CPLUS_INCLUDE_PATH', 'OBJC_INCLUDE_PATH', 'OBJCPLUS_INCLUDE_PATH', @@ -67,7 +67,10 @@ possibly_dangerous_env_vars = ('COMPILER_PATH', 'RC_DEBUG_OPTIONS', 'INCLUDE', 'LIBCLANG_LOGGING', 'LIBCLANG_BGPRIO_INDEX', 'LIBCLANG_BGPRIO_EDIT', 'LIBCLANG_NOTHREADS', 'LIBCLANG_RESOURCE_USAGE', - 'LIBCLANG_CODE_COMPLETION_LOGGING') + 'LIBCLANG_CODE_COMPLETION_LOGGING'] +# Clang/Win32 may refer to %INCLUDE%. vsvarsall.bat sets it. +if platform.system() != 'Windows': + possibly_dangerous_env_vars.append('INCLUDE') for name in possibly_dangerous_env_vars: if name in config.environment: del config.environment[name] |