diff options
Diffstat (limited to 'test/lit.cfg.py')
| -rw-r--r-- | test/lit.cfg.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/test/lit.cfg.py b/test/lit.cfg.py index 26880383d354..e53ff8740035 100644 --- a/test/lit.cfg.py +++ b/test/lit.cfg.py @@ -45,13 +45,18 @@ tool_patterns = [ llvm_config.add_tool_substitutions(tool_patterns) +# LLD tests tend to be flaky on NetBSD, so add some retries. +# We don't do this on other platforms because it's slower. +if platform.system() in ['NetBSD']: + config.test_retry_attempts = 2 + # When running under valgrind, we mangle '-vg' onto the end of the triple so we # can check it with XFAIL and XTARGET. if lit_config.useValgrind: config.target_triple += '-vg' # Running on ELF based *nix -if platform.system() in ['FreeBSD', 'Linux']: +if platform.system() in ['FreeBSD', 'NetBSD', 'Linux']: config.available_features.add('system-linker-elf') # Set if host-cxxabi's demangler can handle target's symbols. @@ -67,7 +72,9 @@ llvm_config.feature_config( 'AVR': 'avr', 'Hexagon': 'hexagon', 'Mips': 'mips', + 'MSP430': 'msp430', 'PowerPC': 'ppc', + 'RISCV': 'riscv', 'Sparc': 'sparc', 'WebAssembly': 'wasm', 'X86': 'x86'}) @@ -93,7 +100,10 @@ if config.have_dia_sdk: tar_executable = lit.util.which('tar', config.environment['PATH']) if tar_executable: tar_version = subprocess.Popen( - [tar_executable, '--version'], stdout=subprocess.PIPE, env={'LANG': 'C'}) - if 'GNU tar' in tar_version.stdout.read().decode(): + [tar_executable, '--version'], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + env={'LANG': 'C'}) + sout, _ = tar_version.communicate() + if 'GNU tar' in sout.decode(): config.available_features.add('gnutar') - tar_version.wait() |