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 | c4d558a43e18b1fa2f094f1ea07f70e19bfb8a3c (patch) | |
| tree | b8f492200e2f8ab146fa7cbead50326ab36470fb /clang/test/lit.cfg | |
| parent | 7b70be397031a9d4a9686fa3f2b8823f8ab92faf (diff) | |
| download | llvm-c4d558a43e18b1fa2f094f1ea07f70e19bfb8a3c.zip llvm-c4d558a43e18b1fa2f094f1ea07f70e19bfb8a3c.tar.gz llvm-c4d558a43e18b1fa2f094f1ea07f70e19bfb8a3c.tar.bz2 | |
test/lit.cfg: Please pass %INCLUDE% to clang.exe on Win32. MS-compatible clang may refer to %INCLUDE%. It fixes r154188.
llvm-svn: 154240
Diffstat (limited to 'clang/test/lit.cfg')
| -rw-r--r-- | clang/test/lit.cfg | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg index 3dee996..738dc38 100644 --- a/clang/test/lit.cfg +++ b/clang/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] |