[llvm] r184602 - Put r184469 disassembler test back on X86

[Renato Golin]

Author: rengolin
Date: Fri Jun 21 17:42:20 2013
New Revision: 184602

URL: http://llvm.org/viewvc/llvm-project?rev=184602&view=rev
Log:
Put r184469 disassembler test back on X86

Added:
    llvm/trunk/test/Object/X86/yaml2obj-elf-symbol-basic.yaml
      - copied, changed from r184599, llvm/trunk/test/Object/yaml2obj-elf-symbol-basic.yaml
Modified:
    llvm/trunk/test/Object/yaml2obj-elf-symbol-basic.yaml

Copied: llvm/trunk/test/Object/X86/yaml2obj-elf-symbol-basic.yaml (from r184599, llvm/trunk/test/Object/yaml2obj-elf-symbol-basic.yaml)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/X86/yaml2obj-elf-symbol-basic.yaml?p2=llvm/trunk/test/Object/X86/yaml2obj-elf-symbol-basic.yaml&p1=llvm/trunk/test/Object/yaml2obj-elf-symbol-basic.yaml&r1=184599&r2=184602&rev=184602&view=diff
==============================================================================
--- llvm/trunk/test/Object/yaml2obj-elf-symbol-basic.yaml (original)
+++ llvm/trunk/test/Object/X86/yaml2obj-elf-symbol-basic.yaml Fri Jun 21 17:42:20 2013
@@ -1,4 +1,4 @@
-# RUN: yaml2obj -format=elf %s | llvm-readobj -symbols - | FileCheck %s
+# RUN: yaml2obj -format=elf %s | llvm-objdump -d -no-show-raw-insn - | FileCheck %s --check-prefix=DISASSEMBLY
 !ELF
 FileHeader:
   Class: ELFCLASS64
@@ -41,8 +41,6 @@ Sections:
 # 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

Modified: llvm/trunk/test/Object/yaml2obj-elf-symbol-basic.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/yaml2obj-elf-symbol-basic.yaml?rev=184602&r1=184601&r2=184602&view=diff
==============================================================================
--- llvm/trunk/test/Object/yaml2obj-elf-symbol-basic.yaml (original)
+++ llvm/trunk/test/Object/yaml2obj-elf-symbol-basic.yaml Fri Jun 21 17:42:20 2013
@@ -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