2 files changed, 46 insertions, 15 deletions
diff --git a/test/Object/X86/yaml2obj-elf-symbol-basic.yaml b/test/Object/X86/yaml2obj-elf-symbol-basic.yaml
new file mode 100644
index 0000000..98d1b7d
--- /dev/null
+++ b/test/Object/X86/yaml2obj-elf-symbol-basic.yaml
@@ -0,0 +1,46 @@
+# RUN: yaml2obj -format=elf %s | llvm-objdump -d -no-show-raw-insn - | FileCheck %s --check-prefix=DISASSEMBLY
+!ELF
+FileHeader:
+  Class: ELFCLASS64
+  Data: ELFDATA2LSB
+  Type: ET_REL
+  Machine: EM_X86_64
+Sections:
+  - Name: .text
+    Type: SHT_PROGBITS
+    Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+    Content: "90EBFE" # x86 machine code
+                      #   NOP ; To make main's `Value` non-zero (for testing).
+                      # main:
+                      #   JMP -2 ; (infloop)
+                      # This YAML file is a valid relocatable object that,
+                      # when linked and run on x86_64, will go into an
+                      # infloop.
+  - Name: .symtab
+    Type: SHT_SYMTAB
+    Symbols:
+      Global:
+        - Name: main
+          Type: STT_FUNC
+          Section: .text
+          Value: 0x1
+          Size: 2
+        - Name: undefined_symbol
+
+# CHECK:      Symbols [
+# CHECK-NEXT:   Symbol {
+# CHECK-NEXT:     Name:  (0)
+# CHECK:        Symbol {
+# CHECK-NEXT:     Name: main
+# CHECK-NEXT:     Value: 0x1
+# CHECK-NEXT:     Size: 2
+# CHECK:          Binding: Global
+# CHECK-NEXT:     Type: Function
+# CHECK:          Section: .text
+# CHECK:        Symbol {
+# CHECK:          Name: undefined_symbol
+# CHECK:          Section:  (0x0)
+
+# DISASSEMBLY:      Disassembly of section .text:
+# DISASSEMBLY-NEXT: main:
+# DISASSEMBLY-NEXT:        1:       jmp     -2
diff --git a/test/Object/yaml2obj-elf-symbol-basic.yaml b/test/Object/yaml2obj-elf-symbol-basic.yaml
index 30aa96c..c561623 100644
--- a/test/Object/yaml2obj-elf-symbol-basic.yaml
+++ b/test/Object/yaml2obj-elf-symbol-basic.yaml
@@ -9,13 +9,6 @@ Sections:
   - Name: .text
     Type: SHT_PROGBITS
     Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
-    Content: "90EBFE" # x86 machine code
-                      #   NOP ; To make main's `Value` non-zero (for testing).
-                      # main:
-                      #   JMP -2 ; (infloop)
-                      # This YAML file is a valid relocatable object that,
-                      # when linked and run on x86_64, will go into an
-                      # infloop.
   - Name: .symtab
     Type: SHT_SYMTAB
     Symbols:
@@ -32,17 +25,9 @@ Sections:
 # CHECK-NEXT:     Name:  (0)
 # CHECK:        Symbol {
 # CHECK-NEXT:     Name: main
-# CHECK-NEXT:     Value: 0x1
-# CHECK-NEXT:     Size: 2
 # CHECK:          Binding: Global
 # CHECK-NEXT:     Type: Function
 # CHECK:          Section: .text
 # CHECK:        Symbol {
 # CHECK:          Name: undefined_symbol
 # CHECK:          Section:  (0x0)
-
-# How to conditionalize on X86 being present?
-# yaml2obj -format=elf %s | llvm-objdump -d -no-show-raw-insn - | FileCheck %s --check-prefix=DISASSEMBLY
-# DISASSEMBLY:      Disassembly of section .text:
-# DISASSEMBLY-NEXT: main:
-# DISASSEMBLY-NEXT:        1:       jmp     -2