[llvm] r360909 - [llvm-objdump]Move test code missed in r360904

James Henderson via llvm-commits llvm-commits at lists.llvm.org
Thu May 16 08:20:08 PDT 2019


Author: jhenderson
Date: Thu May 16 08:20:08 2019
New Revision: 360909

URL: http://llvm.org/viewvc/llvm-project?rev=360909&view=rev
Log:
[llvm-objdump]Move test code missed in r360904

Added:
    llvm/trunk/test/tools/llvm-objdump/X86/section-filter-relocs.test
      - copied, changed from r360904, llvm/trunk/test/tools/llvm-objdump/X86/section-filter-disasm.test
Removed:
    llvm/trunk/test/tools/llvm-objdump/X86/section-filter-disasm.test
Modified:
    llvm/trunk/test/tools/llvm-objdump/section-filter.test

Removed: llvm/trunk/test/tools/llvm-objdump/X86/section-filter-disasm.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/X86/section-filter-disasm.test?rev=360908&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/X86/section-filter-disasm.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/X86/section-filter-disasm.test (removed)
@@ -1,84 +0,0 @@
-## Test that --section works correctly for -d with -r.
-## FIXME: Inline relocations are only printed if the relocation section itself is
-##        specified with --section. This test just characterizes the existing behavior.
-##        See https://bugs.llvm.org/show_bug.cgi?id=41886
-# RUN: yaml2obj %s -o %t.o
-
-## Show non-executable sections are not disassembled even if specified,
-## and that only the specified executable sections are disassembled.
-## Also show that no relocation sections are dumped because none are
-## specified.
-## FIXME: This is different behaviour to GNU objdump, which dumps the non-
-##        executable sections if requested explicitly.
-##        See https://bugs.llvm.org/show_bug.cgi?id=41897.
-# RUN: llvm-objdump -d -r %t.o --section=.text --section=.rodata \
-# RUN:   | FileCheck %s --check-prefix=DISASM --implicit-check-not=.text2 \
-# RUN:           --implicit-check-not=.rodata --implicit-check-not=R_X86_64
-
-## Show that only the specified relocation sections that patch the
-## disassembled sections are dumped.
-# RUN: llvm-objdump -d -r %t.o --section=.text \
-# RUN:                         --section=.rela.text --section=.rela.text2 \
-# RUN:   | FileCheck %s --check-prefixes=DISASM,RELOC --implicit-check-not=.text2 \
-# RUN:           --implicit-check-not=R_X86_64
-
-# DISASM:       Disassembly of section .text:
-# DISASM-EMPTY:
-# DISASM-NEXT:  0000000000000400 .text:
-# DISASM-NEXT:  400: e8 00 00 00 00                callq   0 <.text+0x5>
-# RELOC-NEXT:                      00000401:  R_X86_64_PC32        foo+1
-
---- !ELF
-FileHeader:
-  Class:   ELFCLASS64
-  Data:    ELFDATA2LSB
-  Type:    ET_REL
-  Machine: EM_X86_64
-Sections:
-  - Name:         .text
-    Type:         SHT_PROGBITS
-    Flags:        [SHF_ALLOC, SHF_EXECINSTR]
-    Address:      0x400
-    AddressAlign: 0x10
-    Content:      'e800000000'
-  - Name:         .text2
-    Type:         SHT_PROGBITS
-    Flags:        [SHF_ALLOC, SHF_EXECINSTR]
-    Address:      0x401
-    Content:      '90e800000000'
-  - Name:         .rela.text
-    Type:         SHT_RELA
-    Info:         .text
-    Relocations:
-      - Offset: 1
-        Symbol: foo
-        Addend: 1
-        Type:   R_X86_64_PC32
-  - Name:         .another.rela.text
-    Type:         SHT_RELA
-    Info:         .text
-    Relocations:
-      - Offset: 1
-        Symbol: foo
-        Type:   R_X86_64_GOT32
-  - Name:         .rela.text2
-    Type:         SHT_RELA
-    Info:         .text2
-    Relocations:
-      - Offset: 1
-        Symbol: foo
-        Addend: 2
-        Type:   R_X86_64_PLT32
-  - Name:       .rodata
-    Type:       SHT_PROGBITS
-    Flags:      [SHF_ALLOC]
-    Size:       4
-  - Name:       .rela.rodata
-    Type:       SHT_RELA
-    Info:       .rodata
-    Relocations:
-      - Offset: 0
-        Symbol: foo
-        Type: R_X86_64_NONE
-Symbols:
-  - Name: foo

Copied: llvm/trunk/test/tools/llvm-objdump/X86/section-filter-relocs.test (from r360904, llvm/trunk/test/tools/llvm-objdump/X86/section-filter-disasm.test)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/X86/section-filter-relocs.test?p2=llvm/trunk/test/tools/llvm-objdump/X86/section-filter-relocs.test&p1=llvm/trunk/test/tools/llvm-objdump/X86/section-filter-disasm.test&r1=360904&r2=360909&rev=360909&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/X86/section-filter-disasm.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/X86/section-filter-relocs.test Thu May 16 08:20:08 2019
@@ -82,3 +82,22 @@ Sections:
         Type: R_X86_64_NONE
 Symbols:
   - Name: foo
+
+## Test that --section works when dumping relocation sections.
+# RUN: llvm-objdump -r %t.o --section=.another.rela.text --section=.rela.rodata \
+# RUN:   | FileCheck %s --check-prefix=DUMP-RELOCS --implicit-check-not=R_X86_64 \
+# RUN:                  --implicit-check-not="RELOCATION RECORDS"
+
+# DUMP-RELOCS: RELOCATION RECORDS FOR [.text]:
+# DUMP-RELOCS: 00000001 R_X86_64_GOT32 foo
+# DUMP-RELOCS: RELOCATION RECORDS FOR [.rodata]:
+# DUMP-RELOCS: 00000000 R_X86_64_NONE foo
+
+## Test that --section works with --full-contents.
+# RUN: llvm-objdump -s %t.o --section=.text --section=.rela.text2 \
+# RUN:   | FileCheck %s --check-prefix=CONTENTS \
+# RUN:                  --implicit-check-not=.text \
+# RUN:                  --implicit-check-not=.rodata
+
+# CONTENTS: Contents of section .text:
+# CONTENTS: Contents of section .rela.text2:

Modified: llvm/trunk/test/tools/llvm-objdump/section-filter.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/section-filter.test?rev=360909&r1=360908&r2=360909&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/section-filter.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/section-filter.test Thu May 16 08:20:08 2019
@@ -57,30 +57,11 @@ ProgramHeaders:
     Sections:
       - Section: .bss
 
-## Test that --section works when dumping relocation sections.
-# RUN: llvm-objdump -r %t.o --section=.another.rela.text --section=.rela.rodata \
-# RUN:   | FileCheck %s --check-prefix=DUMP-RELOCS --implicit-check-not=R_X86_64 \
-# RUN:                  --implicit-check-not="RELOCATION RECORDS"
-
-# DUMP-RELOCS: RELOCATION RECORDS FOR [.text]:
-# DUMP-RELOCS: 00000001 R_X86_64_GOT32 foo
-# DUMP-RELOCS: RELOCATION RECORDS FOR [.rodata]:
-# DUMP-RELOCS: 00000000 R_X86_64_NONE foo
-
-## Test that --section works with --full-contents.
-# RUN: llvm-objdump -s %t.o --section=.text --section=.rela.text2 \
-# RUN:   | FileCheck %s --check-prefix=CONTENTS \
-# RUN:                  --implicit-check-not=.text \
-# RUN:                  --implicit-check-not=.rodata
-
-# CONTENTS: Contents of section .text:
-# CONTENTS: Contents of section .rela.text2:
-
 ## Test that --section works with --fault-map-section.
-# RUN: yaml2obj %s --docnum=2 -o %t2.o
-# RUN: llvm-objdump %t2.o --fault-map-section -j __clangast \
+# RUN: yaml2obj %s --docnum=2 -o %t.o
+# RUN: llvm-objdump %t.o --fault-map-section -j __clangast \
 # RUN:   | FileCheck %s --check-prefixes=FAULTMAP,NO-FAULTMAP
-# RUN: llvm-objdump %t2.o --fault-map-section -j .llvm_faultmaps \
+# RUN: llvm-objdump %t.o --fault-map-section -j .llvm_faultmaps \
 # RUN:   | FileCheck %s --check-prefixes=FAULTMAP,WITH-FAULTMAP
 
 # FAULTMAP:           FaultMap table:
@@ -89,9 +70,9 @@ ProgramHeaders:
 # WITH-FAULTMAP-NEXT: NumFunctions: 0
 
 ## Test that --section works with --raw-clang-ast.
-# RUN: llvm-objdump %t2.o --raw-clang-ast -j .llvm_faultmaps \
+# RUN: llvm-objdump %t.o --raw-clang-ast -j .llvm_faultmaps \
 # RUN:   | FileCheck %s --check-prefix=NO-AST --allow-empty
-# RUN: llvm-objdump %t2.o --raw-clang-ast -j __clangast \
+# RUN: llvm-objdump %t.o --raw-clang-ast -j __clangast \
 # RUN:   | FileCheck %s --check-prefix=CLANG-AST
 
 # NO-AST-NOT: {{.}}




More information about the llvm-commits mailing list