[LLD][ELF] - Stop using binary input in merge-invalid-size.s test. NFCI.
authorGeorge Rimar <grimar@accesssoftek.com>
Wed, 15 Aug 2018 14:59:38 +0000 (14:59 +0000)
committerGeorge Rimar <grimar@accesssoftek.com>
Wed, 15 Aug 2018 14:59:38 +0000 (14:59 +0000)
This rewrites the test using yaml.

llvm-svn: 339775

lld/test/ELF/invalid/Inputs/shentsize-zero.elf [deleted file]
lld/test/ELF/invalid/merge-invalid-size.s
lld/test/ELF/invalid/merge-zero-size.test [new file with mode: 0644]

diff --git a/lld/test/ELF/invalid/Inputs/shentsize-zero.elf b/lld/test/ELF/invalid/Inputs/shentsize-zero.elf
deleted file mode 100644 (file)
index 5fa7df2..0000000
Binary files a/lld/test/ELF/invalid/Inputs/shentsize-zero.elf and /dev/null differ
index cc2566d0ee87162a2b83a4d034f161c8231d1f3d..b16889a538a5cc1a5d779b275665bb2569f3260d 100644 (file)
@@ -3,8 +3,5 @@
 // RUN: not ld.lld %t.o -o /dev/null 2>&1 | FileCheck %s
 // CHECK: SHF_MERGE section size must be a multiple of sh_entsize
 
-// Test that we accept a zero sh_entsize.
-// RUN: ld.lld %p/Inputs/shentsize-zero.elf -o /dev/null
-
 .section .foo,"aM",@progbits,4
 .short 42
diff --git a/lld/test/ELF/invalid/merge-zero-size.test b/lld/test/ELF/invalid/merge-zero-size.test
new file mode 100644 (file)
index 0000000..564ed44
--- /dev/null
@@ -0,0 +1,21 @@
+# REQUIRES: x86
+
+# RUN: yaml2obj %s -o %t.o
+
+# Test that we accept a zero sh_entsize for SHF_MERGE section.
+# RUN: ld.lld %t.o -o %t.exe
+
+!ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  OSABI:           ELFOSABI_FREEBSD
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Type:            SHT_PROGBITS
+    Name:            .strings
+    Flags:           [ SHF_ALLOC, SHF_MERGE, SHF_STRINGS ]
+    AddressAlign:    0x04
+    Content:         "FFFFFFFFFFFFFFFF"
+    EntSize:         0x0