[llvm] 840c891 - [llvm-objcopy][NFC] Use generated object file in COFF/add-section.test

[Sergey Dmitriev via llvm-commits]

Author: Sergey Dmitriev
Date: 2019-11-15T08:10:17-08:00
New Revision: 840c891a8c248f1eb65981f492165b037e126652

URL: https://github.com/llvm/llvm-project/commit/840c891a8c248f1eb65981f492165b037e126652
DIFF: https://github.com/llvm/llvm-project/commit/840c891a8c248f1eb65981f492165b037e126652.diff

LOG: [llvm-objcopy][NFC] Use generated object file in COFF/add-section.test

Updated LIT test from D70205 to use generated object file with extended relocation table.

Differential Revision: https://reviews.llvm.org/D70269

Added: 
    llvm/test/tools/llvm-objcopy/COFF/Inputs/x86_64-obj-xrelocs.yaml.gz

Modified: 
    llvm/test/tools/llvm-objcopy/COFF/add-section.test

Removed: 
    llvm/test/tools/llvm-objcopy/COFF/Inputs/x86_64-xrelocs.obj.gz


################################################################################
diff  --git a/llvm/test/tools/llvm-objcopy/COFF/Inputs/x86_64-obj-xrelocs.yaml.gz b/llvm/test/tools/llvm-objcopy/COFF/Inputs/x86_64-obj-xrelocs.yaml.gz
new file mode 100644
index 000000000000..5ef0a7a9e77f
Binary files /dev/null and b/llvm/test/tools/llvm-objcopy/COFF/Inputs/x86_64-obj-xrelocs.yaml.gz 
diff er

diff  --git a/llvm/test/tools/llvm-objcopy/COFF/Inputs/x86_64-xrelocs.obj.gz b/llvm/test/tools/llvm-objcopy/COFF/Inputs/x86_64-xrelocs.obj.gz
deleted file mode 100644
index 9b3cf4ad0e0e..000000000000
Binary files a/llvm/test/tools/llvm-objcopy/COFF/Inputs/x86_64-xrelocs.obj.gz and /dev/null 
diff er

diff  --git a/llvm/test/tools/llvm-objcopy/COFF/add-section.test b/llvm/test/tools/llvm-objcopy/COFF/add-section.test
index e8492c2c6539..a82756ef8850 100644
--- a/llvm/test/tools/llvm-objcopy/COFF/add-section.test
+++ b/llvm/test/tools/llvm-objcopy/COFF/add-section.test
@@ -34,26 +34,19 @@
 
 ## Test that llvm-objcopy can add a section to an object with extended
 ## relocations.
-# RUN: %python %p/../Inputs/ungzip.py %p/Inputs/x86_64-xrelocs.obj.gz > %t.in.xrelocs.obj
-# RUN: llvm-objcopy --add-section=.test.section=%t.sec %t.in.xrelocs.obj %t1.xrelocs.obj
+# RUN: %python %p/../Inputs/ungzip.py %p/Inputs/x86_64-obj-xrelocs.yaml.gz > %t.xrelocs.yaml
+# RUN: yaml2obj %t.xrelocs.yaml > %t.xrelocs.obj
+# RUN: llvm-objcopy --add-section=.test.section=%t.sec %t.xrelocs.obj %t1.xrelocs.obj
 # RUN: llvm-readobj --file-headers --sections --section-data %t1.xrelocs.obj | FileCheck %s --check-prefixes=CHECK-EXTENDED-RELOCS
 
-# CHECK-EXTENDED-RELOCS:      SectionCount: 5
+# CHECK-EXTENDED-RELOCS:      SectionCount: 2
 # CHECK-EXTENDED-RELOCS:      Name: .data
-# CHECK-EXTENDED-RELOCS-NEXT: VirtualSize:
-# CHECK-EXTENDED-RELOCS-NEXT: VirtualAddress:
-# CHECK-EXTENDED-RELOCS-NEXT: RawDataSize:
-# CHECK-EXTENDED-RELOCS-NEXT: PointerToRawData:
-# CHECK-EXTENDED-RELOCS-NEXT: PointerToRelocations:
-# CHECK-EXTENDED-RELOCS-NEXT: PointerToLineNumbers:
-# CHECK-EXTENDED-RELOCS-NEXT: RelocationCount: 65535
-# CHECK-EXTENDED-RELOCS-NEXT: LineNumberCount: 0
-# CHECK-EXTENDED-RELOCS-NEXT: Characteristics [
+# CHECK-EXTENDED-RELOCS:      RelocationCount: 65535
+# CHECK-EXTENDED-RELOCS:      Characteristics [
 # CHECK-EXTENDED-RELOCS-NEXT:   IMAGE_SCN_ALIGN_16BYTES
 # CHECK-EXTENDED-RELOCS-NEXT:   IMAGE_SCN_CNT_INITIALIZED_DATA
 # CHECK-EXTENDED-RELOCS-NEXT:   IMAGE_SCN_LNK_NRELOC_OVFL
 # CHECK-EXTENDED-RELOCS-NEXT:   IMAGE_SCN_MEM_READ
-# CHECK-EXTENDED-RELOCS-NEXT:   IMAGE_SCN_MEM_WRITE
 # CHECK-EXTENDED-RELOCS-NEXT: ]
 # CHECK-EXTENDED-RELOCS:      Name: .test.section
 # CHECK-EXTENDED-RELOCS:      Characteristics [