Minor lit cfg changes for cleaner diff, NFC.
llvm-svn: 231376
diff --git a/poolalloc/test/lit.cfg b/poolalloc/test/lit.cfg
index 63c1b9f..e7516b3 100644
--- a/poolalloc/test/lit.cfg
+++ b/poolalloc/test/lit.cfg
@@ -183,16 +183,15 @@
###
-# Provide a command line for mcjit tests
-lli_mcjit = 'lli -use-mcjit'
+lli = 'lli'
# The target triple used by default by lli is the process target triple (some
# triple appropriate for generating code for the current process) but because
# we don't support COFF in MCJIT well enough for the tests, force ELF format on
# Windows. FIXME: the process target triple should be used here, but this is
# difficult to obtain on Windows.
-if re.search(r'cygwin|mingw32|win32', config.host_triple):
- lli_mcjit += ' -mtriple='+config.host_triple+'-elf'
-config.substitutions.append( ('%lli_mcjit', lli_mcjit) )
+if re.search(r'cygwin|mingw32|windows-gnu|win32', config.host_triple):
+ lli += ' -mtriple='+config.host_triple+'-elf'
+config.substitutions.append( ('%lli', lli ) )
# Similarly, have a macro to use llc with DWARF even when the host is win32.
llc_dwarf = 'llc'
@@ -338,6 +337,10 @@
else:
config.available_features.add("not_ubsan")
+# Check if we should run long running tests.
+if lit_config.params.get("run_long_tests", None) == "true":
+ config.available_features.add("long_tests")
+
# Direct object generation
# Suppress x86_64-mingw32 while investigating since r219108.
if not 'hexagon' in config.target_triple and not re.match(r'^x86_64.*-(mingw32|windows-gnu|win32)', config.target_triple):
diff --git a/poolalloc/test/lit.site.cfg.in b/poolalloc/test/lit.site.cfg.in
index f7fd781..1b62482 100644
--- a/poolalloc/test/lit.site.cfg.in
+++ b/poolalloc/test/lit.site.cfg.in
@@ -25,7 +25,7 @@
config.enable_shared = @ENABLE_SHARED@
config.enable_assertions = @ENABLE_ASSERTIONS@
config.targets_to_build = "@TARGETS_TO_BUILD@"
-config.llvm_bindings = "@LLVM_BINDINGS@"
+config.llvm_bindings = "@LLVM_BINDINGS@".split(' ')
config.host_os = "@HOST_OS@"
config.host_arch = "@HOST_ARCH@"
config.host_cc = "@HOST_CC@"
