From: Sean Silva <silvas@purdue.edu>
Date: Fri, 21 Jun 2013 23:17:10 +0000 (+0000)
Subject: Revert "Put r184469 disassembler test back on X86"
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8fa38898ffb0b1d295e45586c8452e49daddc751;p=oota-llvm.git

Revert "Put r184469 disassembler test back on X86"

This reverts commit r184602. In an upcoming commit, I will just remove
the disassembler part of the test; it was mostly just a "nifty" thing
marking a milestone but it doesn't test anything that isn't tested
elsewhere.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184606 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/Object/X86/yaml2obj-elf-symbol-basic.yaml b/test/Object/X86/yaml2obj-elf-symbol-basic.yaml
deleted file mode 100644
index 98d1b7dd548..00000000000
--- a/test/Object/X86/yaml2obj-elf-symbol-basic.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 c5616234099..30aa96c203e 100644
--- a/test/Object/yaml2obj-elf-symbol-basic.yaml
+++ b/test/Object/yaml2obj-elf-symbol-basic.yaml
@@ -9,6 +9,13 @@ 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:
@@ -25,9 +32,17 @@ 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