From: George Rimar <grimar@accesssoftek.com>
Date: Tue, 17 Sep 2019 08:38:53 +0000 (+0000)
Subject: [llvm-objcopy] - Remove python invocations from 2 test cases.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa966721814753ae38474c6fe050a73b9f5a22de;p=llvm

[llvm-objcopy] - Remove python invocations from 2 test cases.

It is possible to use yaml2obj to create sections with overlapping sh_offset now.
This patch does that.

Differential revision: https://reviews.llvm.org/D67610

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

diff --git a/test/tools/llvm-objcopy/ELF/overlapping-sections-in-segments.test b/test/tools/llvm-objcopy/ELF/overlapping-sections-in-segments.test
index cd92a7eb643..1c7cb2814fe 100644
--- a/test/tools/llvm-objcopy/ELF/overlapping-sections-in-segments.test
+++ b/test/tools/llvm-objcopy/ELF/overlapping-sections-in-segments.test
@@ -4,17 +4,6 @@
 ## inputs somehow.
 # RUN: yaml2obj %s -o %t.o
 
-## First, check the address of the section header table.
-# RUN: llvm-readobj --file-headers %t.o | FileCheck %s --check-prefix=SHDRS-OFFSET
-# SHDRS-OFFSET: SectionHeaderOffset: 0x1050{{$}}
-
-## Binary edit the section header sh_offset field of the second section to
-## (e_shoff+64*2+24 = 0x10e8) overlap the first one.
-# RUN: %python -c "with open('%/t.o', 'r+b') as input: import struct; bytes = struct.pack('<Q', 0x1001); input.seek(0x10e8); input.write(bytes)"
-
-## Sanity check that the binary editing modified the correct field.
-# RUN: llvm-readobj --section-headers %t.o | FileCheck %s
-
 ## Check that the contents are as expected before the copy.
 # RUN: llvm-readobj -x .first -x .second %t.o | FileCheck %s --check-prefix=CONTENTS
 
@@ -49,6 +38,7 @@ Sections:
   - Name: .second
     Type: SHT_PROGBITS
     Content: '89abcdef'
+    ShOffset: 0x1001
 ProgramHeaders:
   - Type:     PT_LOAD
     FileSize: 5
diff --git a/test/tools/llvm-objcopy/ELF/overlapping-sections.test b/test/tools/llvm-objcopy/ELF/overlapping-sections.test
index 2c470e6adc1..49f59804e9d 100644
--- a/test/tools/llvm-objcopy/ELF/overlapping-sections.test
+++ b/test/tools/llvm-objcopy/ELF/overlapping-sections.test
@@ -3,22 +3,6 @@
 ## inputs somehow.
 # RUN: yaml2obj %s -o %t.o
 
-## First, check the address of the section header table.
-# RUN: llvm-readobj --file-headers %t.o | FileCheck %s --check-prefix=SHDRS-OFFSET
-# SHDRS-OFFSET: SectionHeaderOffset: 0x1050{{$}}
-
-## Binary edit the section header sh_offset field of the second section to
-## (e_shoff+64*2+24 = 0x10e8) overlap the first one.
-# RUN: %python -c "with open('%/t.o', 'r+b') as input: import struct; bytes = struct.pack('<Q', 0x1001); input.seek(0x10e8); input.write(bytes)"
-
-## Sanity check that the binary editing modified the correct field.
-# RUN: llvm-readobj --section-headers %t.o | FileCheck %s --check-prefix=VALIDATE
-
-# VALIDATE: Name: .first
-# VALIDATE: Offset: 0x1000
-# VALIDATE: Name: .second
-# VALIDATE: Offset: 0x1001
-
 ## Check that the contents are as expected before the copy.
 # RUN: llvm-readobj -x .first -x .second %t.o | FileCheck %s --check-prefix=CONTENTS
 
@@ -54,3 +38,4 @@ Sections:
   - Name: .second
     Type: SHT_PROGBITS
     Content: '89abcdef'
+    ShOffset: 0x1001