From 4c5e43da7792f75567b693105cc53e3f1992ad98 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Wed, 8 Apr 2015 08:55:49 -0700 Subject: Update aosp/master llvm for rebase to r233350 Change-Id: I07d935f8793ee8ec6b7da003f6483046594bca49 --- test/lit.cfg | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'test/lit.cfg') diff --git a/test/lit.cfg b/test/lit.cfg index 7b7a269..059af89 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -41,7 +41,7 @@ config.test_format = lit.formats.ShTest(execute_external) # suffixes: A list of file extensions to treat as test files. This is overriden # by individual lit.local.cfg files in the test subdirectories. -config.suffixes = ['.ll', '.c', '.cpp', '.test', '.txt', '.s'] +config.suffixes = ['.ll', '.c', '.cxx', '.test', '.txt', '.s'] # excludes: A list of directories to exclude from the testsuite. The 'Inputs' # subdirectories contain auxiliary inputs for various tests in their parent @@ -176,7 +176,7 @@ lli = 'lli' # 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|windows-gnu|win32', config.host_triple): +if re.search(r'cygwin|mingw32|windows-gnu|windows-msvc|win32', config.host_triple): lli += ' -mtriple='+config.host_triple+'-elf' config.substitutions.append( ('%lli', lli ) ) @@ -188,6 +188,7 @@ config.substitutions.append( ('%llc_dwarf', llc_dwarf) ) # Add site-specific substitutions. config.substitutions.append( ('%gold', config.gold_executable) ) +config.substitutions.append( ('%ld64', config.ld64_executable) ) config.substitutions.append( ('%go', config.go_executable) ) config.substitutions.append( ('%llvmshlibdir', config.llvm_shlib_dir) ) config.substitutions.append( ('%shlibext', config.llvm_shlib_ext) ) @@ -228,6 +229,7 @@ for pattern in [r"\bbugpoint\b(?!-)", r"\bllvm-bcanalyzer\b", r"\bllvm-config\b", r"\bllvm-cov\b", + r"\bllvm-cxxdump\b", r"\bllvm-diff\b", r"\bllvm-dis\b", r"\bllvm-dsymutil\b", @@ -246,7 +248,6 @@ for pattern in [r"\bbugpoint\b(?!-)", r"\bllvm-rtdyld\b", r"\bllvm-size\b", r"\bllvm-tblgen\b", - r"\bllvm-vtabledump\b", r"\bllvm-c-test\b", r"\bmacho-dump\b", NOJUNK + r"\bopt\b", @@ -312,6 +313,10 @@ if config.llvm_use_sanitizer == "Undefined": 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): @@ -350,8 +355,10 @@ def have_ld_plugin_support(): if len(fields) != 3: return False emulations = fields[2].split() - if 'elf32ppc' not in emulations or 'elf_x86_64' not in emulations: + if 'elf_x86_64' not in emulations: return False + if 'elf32ppc' in emulations: + config.available_features.add('ld_emu_elf32ppc') ld_version = subprocess.Popen([config.gold_executable, '--version'], stdout = subprocess.PIPE) if not 'GNU gold' in ld_version.stdout.read().decode(): @@ -363,6 +370,22 @@ def have_ld_plugin_support(): if have_ld_plugin_support(): config.available_features.add('ld_plugin') +def have_ld64_plugin_support(): + if config.ld64_executable == '': + return False + + ld_cmd = subprocess.Popen([config.ld64_executable, '-v'], stderr = subprocess.PIPE) + ld_out = ld_cmd.stderr.read().decode() + ld_cmd.wait() + + if 'ld64' not in ld_out or 'LTO' not in ld_out: + return False + + return True + +if have_ld64_plugin_support(): + config.available_features.add('ld64_plugin') + # Ask llvm-config about assertion mode. try: llvm_config_cmd = subprocess.Popen( -- cgit v1.1