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

[grimar]

Summary

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

[jhenderson]

LGTM, with one possible suggestion.

test/tools/llvm-objcopy/ELF/overlapping-sections-in-segments.test

7 ↗

(On Diff #220298)

I don't mind if you want to keep it, but you can probably just get rid of the sanity check now. Now it is just a check that yaml2obj works as expected.

test/tools/llvm-objcopy/ELF/overlapping-sections.test

6 ↗

(On Diff #220298)

Ditto.

[grimar]

test/tools/llvm-objcopy/ELF/overlapping-sections-in-segments.test

7 ↗

(On Diff #220298)

Yeah, I thought about that too. I had no strong feeling. I'll remove then.

llvm/trunk/test/tools/llvm-objcopy/ELF/overlapping-sections-in-segments.test

 ## This test shows that llvm-objcopy does not baulk at overlapping sections
 ## where such sections are within segments.
 ## These don't really make sense, but the tool should still handle invalid
 ## 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
 
 ## Now check that the section contents are still correct after the copy and show that
 ## llvm-objcopy hasn't "unoverlapped" these sections because they are in segments.
 # RUN: llvm-objcopy %t.o %t2.o
 # RUN: llvm-readobj --section-headers %t2.o | FileCheck %s
 # RUN: llvm-readobj -x .first -x .second %t2.o | FileCheck %s --check-prefix=CONTENTS

 Sections:
   - Name: .first
     Type: SHT_PROGBITS
     Content: '01234567'
     AddressAlign: 0x1000
   - Name: .second
     Type: SHT_PROGBITS
     Content: '89abcdef'
+    ShOffset: 0x1001
 ProgramHeaders:
   - Type:     PT_LOAD
     FileSize: 5
     Offset:   0x1000
     Align:    0x1000

llvm/trunk/test/tools/llvm-objcopy/ELF/overlapping-sections.test

 ## This test shows that llvm-objcopy does not baulk at overlapping sections.
 ## These don't really make sense, but the tool should still handle invalid
 ## 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
 
 ## Now check that the section contents are still correct after the copy.
 ## Also characterize the behavior of llvm-objcopy in that it "unoverlaps" the
 ## two sections.
 # RUN: llvm-objcopy %t.o %t2.o
 # RUN: llvm-readobj --section-headers %t2.o | FileCheck %s

 Sections:
   - Name: .first
     Type: SHT_PROGBITS
     Content: '01234567'
     AddressAlign: 0x1000
   - Name: .second
     Type: SHT_PROGBITS
     Content: '89abcdef'
+    ShOffset: 0x1001