diff options
| -rw-r--r-- | clang/test/lit.cfg | 4 | ||||
| -rw-r--r-- | llvm/test/lit.cfg | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg index 4567f179f81..70353c61958 100644 --- a/clang/test/lit.cfg +++ b/clang/test/lit.cfg @@ -404,11 +404,11 @@ if not re.match(r'.*-win32$', config.target_triple): config.available_features.add('non-ms-sdk') # [PR8833] LLP64-incompatible tests -if not re.match(r'^x86_64.*-(win32|mingw32)$', config.target_triple): +if not re.match(r'^x86_64.*-(win32|mingw32|windows-gnu)$', config.target_triple): config.available_features.add('LP64') # [PR12920] "clang-driver" -- set if gcc driver is not used. -if not re.match(r'.*-(cygwin|mingw32)$', config.target_triple): +if not re.match(r'.*-(cygwin|mingw32|windows-gnu)$', config.target_triple): config.available_features.add('clang-driver') # [PR18856] Depends to remove opened file. On win32, a file could be removed diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg index b9b4df12217..d628dfb76f2 100644 --- a/llvm/test/lit.cfg +++ b/llvm/test/lit.cfg @@ -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|win32', config.host_triple): +if re.search(r'cygwin|mingw32|windows-gnu|win32', config.host_triple): lli += ' -mtriple='+config.host_triple+'-elf' config.substitutions.append( ('%lli', lli ) ) @@ -309,7 +309,7 @@ else: # 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|win32)', config.target_triple): +if not 'hexagon' in config.target_triple and not re.match(r'^x86_64.*-(mingw32|windows-gnu|win32)', config.target_triple): config.available_features.add("object-emission") if config.have_zlib == "1": @@ -384,7 +384,7 @@ if 'darwin' == sys.platform: sysctl_cmd.wait() # .debug_frame is not emitted for targeting Windows x64. -if not re.match(r'^x86_64.*-(mingw32|win32)', config.target_triple): +if not re.match(r'^x86_64.*-(mingw32|windows-gnu|win32)', config.target_triple): config.available_features.add('debug_frame') # Check if we should use gmalloc. |
