[lld] r206947 - XFAIL the Mips tests when we don't have the target.

Filipe Cabecinhas me at filcab.net
Tue Apr 22 22:35:27 PDT 2014


Author: filcab
Date: Wed Apr 23 00:35:26 2014
New Revision: 206947

URL: http://llvm.org/viewvc/llvm-project?rev=206947&view=rev
Log:
XFAIL the Mips tests when we don't have the target.

These tests shouldn't even try to use the Mips target, but let's make
them not fail when we don't have it while they don't get fixed.

Modified:
    lld/trunk/test/elf/Mips/base-address.test
    lld/trunk/test/elf/Mips/dynlib-dynamic.test
    lld/trunk/test/elf/Mips/dynlib-dynsym.test
    lld/trunk/test/elf/Mips/dynlib-fileheader.test
    lld/trunk/test/elf/Mips/entry-name.test
    lld/trunk/test/elf/Mips/exe-dynamic.test
    lld/trunk/test/elf/Mips/exe-dynsym.test
    lld/trunk/test/elf/Mips/exe-fileheader.test
    lld/trunk/test/elf/Mips/exe-got.test
    lld/trunk/test/elf/Mips/got16.test
    lld/trunk/test/elf/Mips/gotsym.test
    lld/trunk/test/elf/Mips/hilo16-1.test
    lld/trunk/test/elf/Mips/hilo16-2.test
    lld/trunk/test/elf/Mips/hilo16-3.test
    lld/trunk/test/elf/Mips/hilo16-4.test
    lld/trunk/test/elf/Mips/interpreter.test
    lld/trunk/test/elf/Mips/la25-stub.test
    lld/trunk/test/elf/Mips/plt-1.test
    lld/trunk/test/elf/Mips/plt-header.test
    lld/trunk/test/elf/Mips/r26-1.test
    lld/trunk/test/elf/Mips/r26-2.test
    lld/trunk/test/elf/Mips/rcopy.test
    lld/trunk/test/lit.cfg

Modified: lld/trunk/test/elf/Mips/base-address.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/base-address.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/base-address.test (original)
+++ lld/trunk/test/elf/Mips/base-address.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check executable base address configuration. Base address should be
 # equal to 0x400000 and the MIPS_BASE_ADDRESS dynamic tag's value should
 # be the same.

Modified: lld/trunk/test/elf/Mips/dynlib-dynamic.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/dynlib-dynamic.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/dynlib-dynamic.test (original)
+++ lld/trunk/test/elf/Mips/dynlib-dynamic.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check MIPS specific tags in the dynamic table.
 
 # Build shared library

Modified: lld/trunk/test/elf/Mips/dynlib-dynsym.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/dynlib-dynsym.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/dynlib-dynsym.test (original)
+++ lld/trunk/test/elf/Mips/dynlib-dynsym.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check sorting of .dynsym content accordingly to .got section.
 
 # Build shared library

Modified: lld/trunk/test/elf/Mips/dynlib-fileheader.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/dynlib-fileheader.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/dynlib-fileheader.test (original)
+++ lld/trunk/test/elf/Mips/dynlib-fileheader.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check ELF Header for shared library.
 
 # Build shared library

Modified: lld/trunk/test/elf/Mips/entry-name.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/entry-name.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/entry-name.test (original)
+++ lld/trunk/test/elf/Mips/entry-name.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check name of executable entry symbol.
 # RUN: llvm-mc -triple=mipsel -filetype=obj -o=%t1 %s
 # RUN: lld -flavor gnu -target mipsel --noinhibit-exec -o %t2 %t1

Modified: lld/trunk/test/elf/Mips/exe-dynamic.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/exe-dynamic.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/exe-dynamic.test (original)
+++ lld/trunk/test/elf/Mips/exe-dynamic.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check MIPS specific tags in the dynamic table in case executable linking.
 
 # Build shared library

Modified: lld/trunk/test/elf/Mips/exe-dynsym.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/exe-dynsym.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/exe-dynsym.test (original)
+++ lld/trunk/test/elf/Mips/exe-dynsym.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check that symbol referenced by an entry in the global part of GOT
 # has a corresponded entry in the .dynsym section.
 

Modified: lld/trunk/test/elf/Mips/exe-fileheader.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/exe-fileheader.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/exe-fileheader.test (original)
+++ lld/trunk/test/elf/Mips/exe-fileheader.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check ELF Header for non-pic executable file.
 
 # Build shared library

Modified: lld/trunk/test/elf/Mips/exe-got.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/exe-got.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/exe-got.test (original)
+++ lld/trunk/test/elf/Mips/exe-got.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check that external symbol defined in the executable file
 # and referenced by R_MIPS_CALL16 relocation has a corresponded
 # entry in the local GOT section.

Modified: lld/trunk/test/elf/Mips/got16.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/got16.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/got16.test (original)
+++ lld/trunk/test/elf/Mips/got16.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check handling of global/local GOT16 relocations.
 # RUN: lld -flavor gnu -target mipsel -shared --noinhibit-exec \
 # RUN:     --output-filetype=yaml %S/Inputs/got16.o \

Modified: lld/trunk/test/elf/Mips/gotsym.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/gotsym.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/gotsym.test (original)
+++ lld/trunk/test/elf/Mips/gotsym.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check _gp_disp and GOT_OFFSET_TABLE value
 # RUN: llvm-mc -triple=mipsel -filetype=obj -o=%t1 %s
 

Modified: lld/trunk/test/elf/Mips/hilo16-1.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/hilo16-1.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/hilo16-1.test (original)
+++ lld/trunk/test/elf/Mips/hilo16-1.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check handling multiple HI16 relocation followed by a single LO16 relocation.
 #
 # RUN: llvm-mc -triple=mipsel -filetype=obj -o=%t-obj %s

Modified: lld/trunk/test/elf/Mips/hilo16-2.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/hilo16-2.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/hilo16-2.test (original)
+++ lld/trunk/test/elf/Mips/hilo16-2.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check handling of HI16 and LO16 relocations for regular symbol.
 #
 # R_MIPS_HI16: (AHL + S) - (short)(AHL + S)

Modified: lld/trunk/test/elf/Mips/hilo16-3.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/hilo16-3.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/hilo16-3.test (original)
+++ lld/trunk/test/elf/Mips/hilo16-3.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check handling of HI16 and LO16 relocations for _gp_disp.
 #
 # R_MIPS_HI16: (AHL + GP - P) - (short)(AHL + GP - P)

Modified: lld/trunk/test/elf/Mips/hilo16-4.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/hilo16-4.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/hilo16-4.test (original)
+++ lld/trunk/test/elf/Mips/hilo16-4.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check pairing of R_MIPS_HI16 and R_MIPS_LO16 relocations.
 # RUN: yaml2obj -format=elf %s > %t-obj
 # RUN: lld -flavor gnu -target mipsel -e glob1 -o %t-exe %t-obj

Modified: lld/trunk/test/elf/Mips/interpreter.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/interpreter.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/interpreter.test (original)
+++ lld/trunk/test/elf/Mips/interpreter.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check program interpreter setup.
 # RUN: llvm-mc -triple=mipsel -filetype=obj -o=%t1 %s
 # RUN: lld -flavor gnu -target mipsel -e main -o %t2 %t1

Modified: lld/trunk/test/elf/Mips/la25-stub.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/la25-stub.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/la25-stub.test (original)
+++ lld/trunk/test/elf/Mips/la25-stub.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check LA25 stubs creation when PIC code is called from non-PIC routines.
 
 # Build executable from pic and non-pic code.

Modified: lld/trunk/test/elf/Mips/plt-1.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/plt-1.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/plt-1.test (original)
+++ lld/trunk/test/elf/Mips/plt-1.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Test1. Check PLT entries creation when:
 #   a) Linking non-shared executable file
 #   b) Relocations' targets are symbols defined in the shared object.

Modified: lld/trunk/test/elf/Mips/plt-header.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/plt-header.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/plt-header.test (original)
+++ lld/trunk/test/elf/Mips/plt-header.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check initialization of .plt header entries.
 
 # Build shared library

Modified: lld/trunk/test/elf/Mips/r26-1.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/r26-1.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/r26-1.test (original)
+++ lld/trunk/test/elf/Mips/r26-1.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check handling of R_MIPS_26 relocation.
 
 # Build shared library

Modified: lld/trunk/test/elf/Mips/r26-2.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/r26-2.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/r26-2.test (original)
+++ lld/trunk/test/elf/Mips/r26-2.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check reading addendum for R_MIPS_26 relocation.
 # RUN: yaml2obj -format=elf %s > %t-obj
 # RUN: lld -flavor gnu -target mipsel -o %t-exe %t-obj

Modified: lld/trunk/test/elf/Mips/rcopy.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/rcopy.test?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/rcopy.test (original)
+++ lld/trunk/test/elf/Mips/rcopy.test Wed Apr 23 00:35:26 2014
@@ -1,3 +1,5 @@
+# REQUIRES: mips
+
 # Check handling of R_MIPS_COPY relocation
 
 # Build shared library

Modified: lld/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/lit.cfg?rev=206947&r1=206946&r2=206947&view=diff
==============================================================================
--- lld/trunk/test/lit.cfg (original)
+++ lld/trunk/test/lit.cfg Wed Apr 23 00:35:26 2014
@@ -130,7 +130,7 @@ import subprocess
 try:
     llvm_config_cmd = \
      subprocess.Popen([os.path.join(llvm_tools_dir, 'llvm-config'),
-                     '--build-mode', '--assertion-mode'],
+                     '--build-mode', '--assertion-mode', '--targets-built'],
                       stdout = subprocess.PIPE)
 except OSError as why:
     print("Could not find llvm-config in " + llvm_tools_dir)
@@ -143,6 +143,8 @@ if re.search(r'DEBUG', llvm_config_outpu
     config.available_features.add('debug')
 if re.search(r'ON', llvm_config_output_list[1]):
     config.available_features.add('asserts')
+if re.search(r'Mips', llvm_config_output_list[2]):
+    config.available_features.add('mips')
 llvm_config_cmd.wait()
 
 # Check if Windows resource file compiler exists.





More information about the llvm-commits mailing list