[PATCH] D88991: [LLD] Ignore ELF tests when ld.lld defaults to MinGW

[Mateusz Mikuła via Phabricator via llvm-commits]

mati865 created this revision.
mati865 added reviewers: MaskRay, mstorsjo.
mati865 added a project: lld.
Herald added subscribers: llvm-commits, mgorny.
Herald added a project: LLVM.
mati865 requested review of this revision.

Follow-up to https://reviews.llvm.org/D87418


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D88991

Files:
  lld/test/CMakeLists.txt
  lld/test/lit.cfg.py
  lld/test/lit.site.cfg.py.in


Index: lld/test/lit.site.cfg.py.in
===================================================================
--- lld/test/lit.site.cfg.py.in
+++ lld/test/lit.site.cfg.py.in
@@ -16,6 +16,7 @@
 config.have_zlib = @LLVM_ENABLE_ZLIB@
 config.have_libxml2 = @LLVM_ENABLE_LIBXML2@
 config.sizeof_void_p = @CMAKE_SIZEOF_VOID_P@
+config.ld_lld_default_mingw = @LLD_DEFAULT_LD_LLD_IS_MINGW@
 
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
Index: lld/test/lit.cfg.py
===================================================================
--- lld/test/lit.cfg.py
+++ lld/test/lit.cfg.py
@@ -110,3 +110,7 @@
     sout, _ = tar_version.communicate()
     if 'GNU tar' in sout.decode():
         config.available_features.add('gnutar')
+
+# ELF tests expect the default target for ld.lld to be ELF.
+if config.ld_lld_default_mingw:
+    config.excludes.append('ELF')
Index: lld/test/CMakeLists.txt
===================================================================
--- lld/test/CMakeLists.txt
+++ lld/test/CMakeLists.txt
@@ -7,6 +7,7 @@
 llvm_canonicalize_cmake_booleans(
   LLVM_ENABLE_ZLIB
   LLVM_ENABLE_LIBXML2
+  LLD_DEFAULT_LD_LLD_IS_MINGW
   )
 
 configure_lit_site_cfg(


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D88991.296744.patch
Type: text/x-patch
Size: 1259 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201007/03d9b427/attachment.bin>