diff options
Diffstat (limited to 'test/lit.common.cfg')
| -rw-r--r-- | test/lit.common.cfg | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/test/lit.common.cfg b/test/lit.common.cfg index f19fde2f89eb..1048c46f11bc 100644 --- a/test/lit.common.cfg +++ b/test/lit.common.cfg @@ -52,7 +52,8 @@ possibly_dangerous_env_vars = ['ASAN_OPTIONS', 'DFSAN_OPTIONS', 'LSAN_OPTIONS', 'LIBCLANG_LOGGING', 'LIBCLANG_BGPRIO_INDEX', 'LIBCLANG_BGPRIO_EDIT', 'LIBCLANG_NOTHREADS', 'LIBCLANG_RESOURCE_USAGE', - 'LIBCLANG_CODE_COMPLETION_LOGGING'] + 'LIBCLANG_CODE_COMPLETION_LOGGING', + 'XRAY_OPTIONS'] # Clang/Win32 may refer to %INCLUDE%. vsvarsall.bat sets it. if platform.system() != 'Windows': possibly_dangerous_env_vars.append('INCLUDE') @@ -87,6 +88,9 @@ config.substitutions.append( ('%run', config.emulator) ) # Define CHECK-%os to check for OS-dependent output. config.substitutions.append( ('CHECK-%os', ("CHECK-" + config.host_os))) +# Define %arch to check for architecture-dependent output. +config.substitutions.append( ('%arch', (config.host_arch))) + if config.host_os == 'Windows': # FIXME: This isn't quite right. Specifically, it will succeed if the program # does not crash but exits with a non-zero exit code. We ought to merge @@ -103,6 +107,7 @@ if target_arch: config.available_features.add(target_arch + '-target-arch') if target_arch in ['x86_64', 'i386', 'i686']: config.available_features.add('x86-target-arch') + config.available_features.add(target_arch + '-' + config.host_os.lower()) compiler_rt_debug = getattr(config, 'compiler_rt_debug', False) if not compiler_rt_debug: @@ -136,6 +141,10 @@ if config.host_os == 'Darwin': except: pass + config.substitutions.append( ("%macos_min_target_10_11", "-mmacosx-version-min=10.11") ) +else: + config.substitutions.append( ("%macos_min_target_10_11", "") ) + sancovcc_path = os.path.join(llvm_tools_dir, "sancov") if os.path.exists(sancovcc_path): config.available_features.add("has_sancovcc") @@ -148,7 +157,7 @@ def is_linux_lto_supported(): if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold.so')): return False - ld_cmd = subprocess.Popen([config.gold_executable, '--help'], stdout = subprocess.PIPE) + ld_cmd = subprocess.Popen([config.gold_executable, '--help'], stdout = subprocess.PIPE, env={'LANG': 'C'}) ld_out = ld_cmd.stdout.read().decode() ld_cmd.wait() @@ -175,6 +184,9 @@ elif config.host_os == 'Windows' and is_windows_lto_supported(): else: config.lto_supported = False +if config.lto_supported: + config.available_features.add('lto') + # Ask llvm-config about assertion mode. try: llvm_config_cmd = subprocess.Popen( |