Check file name in errors and return lost checksum checks

Author: e-kud

llvm/test/tools/llvm-objcopy/COFF/strip-invalid-symidx-section.test

@@ -8,9 +8,9 @@
 ## In this case, the symbol .gfids$y is not present at all.
 
 # RUN: yaml2obj %s --docnum=1 -o %t1.in.o
-# RUN: not llvm-objcopy --strip-debug %t1.in.o %t1.out.o 2>&1 | FileCheck %s --check-prefix=ERROR-NOSYM
+# RUN: not llvm-objcopy --strip-debug %t1.in.o %t1.out.o 2>&1 | FileCheck %s --check-prefix=ERROR-NOSYM -DFILE=%t1.out.o
 
-# ERROR-NOSYM: section '.gfids$y' does not have the corresponding symbol or the symbol has unexpected format
+# ERROR-NOSYM: error: '[[FILE]]': section '.gfids$y' does not have the corresponding symbol or the symbol has unexpected format
 
 --- !COFF
 header:
@@ -55,9 +55,9 @@ symbols:
 ## In this case, the symbol .giats$y has a non-zero offset.
 
 # RUN: yaml2obj %s --docnum=2 -o %t2.in.o
-# RUN: not llvm-objcopy --strip-debug %t2.in.o %t2.out.o 2>&1 | FileCheck %s --check-prefix=ERROR-OFFSET
+# RUN: not llvm-objcopy --strip-debug %t2.in.o %t2.out.o 2>&1 | FileCheck %s --check-prefix=ERROR-OFFSET -DFILE=%t2.out.o
 
-# ERROR-OFFSET: section '.giats$y' does not have the corresponding symbol or the symbol has unexpected format
+# ERROR-OFFSET: error: '[[FILE]]': section '.giats$y' does not have the corresponding symbol or the symbol has unexpected format
 
 --- !COFF
 header:
@@ -114,9 +114,9 @@ symbols:
 ## In this case, the symbol .gljmp$y has a non-static storage class.
 
 # RUN: yaml2obj %s --docnum=3 -o %t3.in.o
-# RUN: not llvm-objcopy --strip-debug %t3.in.o %t3.out.o 2>&1 | FileCheck %s --check-prefix=ERROR-EXTERNAL
+# RUN: not llvm-objcopy --strip-debug %t3.in.o %t3.out.o 2>&1 | FileCheck %s --check-prefix=ERROR-EXTERNAL -DFILE=%t3.out.o
 
-# ERROR-EXTERNAL: section '.gljmp$y' does not have the corresponding symbol or the symbol has unexpected format
+# ERROR-EXTERNAL: error: '[[FILE]]': section '.gljmp$y' does not have the corresponding symbol or the symbol has unexpected format
 
 --- !COFF
 header:
@@ -169,9 +169,9 @@ symbols:
 ## of .symidx directives, e.g .giats$y, .gljmp$y and .gehcont$y.
 
 # RUN: yaml2obj %s --docnum=4 -o %t4.in.o
-# RUN: not llvm-objcopy --strip-debug %t4.in.o %t4.out.o 2>&1 | FileCheck %s --check-prefix=ERROR-SYMIDX
+# RUN: not llvm-objcopy --strip-debug %t4.in.o %t4.out.o 2>&1 | FileCheck %s --check-prefix=ERROR-SYMIDX  -DFILE=%t4.out.o
 
-# ERROR-SYMIDX: section '.gfids$y' contains a .symidx (16) that is incorrect or was stripped
+# ERROR-SYMIDX: error: '[[FILE]]': section '.gfids$y' contains a .symidx (16) that is incorrect or was stripped
 --- !COFF
 header:
   Machine:         IMAGE_FILE_MACHINE_AMD64

llvm/test/tools/llvm-objcopy/COFF/strip-update-symidx-section.test

@@ -5,7 +5,36 @@
 # RUN: yaml2obj %s -o %t.in.o
 
 # RUN: llvm-objcopy --strip-debug %t.in.o %t.out.o
-# RUN: llvm-readobj -x '.gehcont$y' -x '.gfids$y' -x '.giats$y' -x '.gljmp$y' %t.out.o | FileCheck %s
+# RUN: llvm-readobj -s -x '.gehcont$y' -x '.gfids$y' -x '.giats$y' -x '.gljmp$y' %t.out.o | FileCheck %s
+
+# CHECK: Symbols [
+# CHECK:     Name: .text
+# CHECK:     Name: .data
+# CHECK:     Name: .bss
+# CHECK:     Name: .text
+# CHECK:     Name: ?foo@@YAXXZ
+# CHECK:     Name: .data
+# CHECK:     Name: .drectve
+# CHECK:     Name: .gehcont$y
+# CHECK:     AuxSectionDef {
+# CHECK:       Checksum: 0x20BA8B48
+# CHECK:     }
+# CHECK:     Name: ?foo2@@YAXXZ
+# CHECK:     Name: $ehgcr_0_1
+# CHECK:     Name: .gfids$y
+# CHECK:     AuxSectionDef {
+# CHECK:       Checksum: 0x5B6F2027
+# CHECK:     }
+# CHECK:     Name: .giats$y
+# CHECK:     AuxSectionDef {
+# CHECK:       Checksum: 0x95AD7F70
+# CHECK:     }
+# CHECK:     Name: .gljmp$y
+# CHECK:     AuxSectionDef {
+# CHECK:       Checksum: 0xFACF36F8
+# CHECK:     }
+# CHECK:     Name: foo
+# CHECK: ]
 
 # CHECK:      Hex dump of section '.gehcont$y':
 # CHECK-NEXT: 0x00000000 10000000 10000000 10000000
@@ -193,7 +222,7 @@ symbols:
       Length:          12
       NumberOfRelocations: 0
       NumberOfLinenumbers: 0
-      CheckSum:        820498156
+      CheckSum:        0x30E7CEEC
       Number:          8
   - Name:            '?foo2@@YAXXZ'
     Value:           0
@@ -217,7 +246,7 @@ symbols:
       Length:          8
       NumberOfRelocations: 0
       NumberOfLinenumbers: 0
-      CheckSum:        1167279533
+      CheckSum:        0x459345AD
       Number:          9
   - Name:            '.giats$y'
     Value:           0
@@ -229,7 +258,7 @@ symbols:
       Length:          8
       NumberOfRelocations: 0
       NumberOfLinenumbers: 0
-      CheckSum:        830808662
+      CheckSum:        0x31852256
       Number:          10
   - Name:            '.gljmp$y'
     Value:           0
@@ -241,7 +270,7 @@ symbols:
       Length:          16
       NumberOfRelocations: 0
       NumberOfLinenumbers: 0
-      CheckSum:        3322439691
+      CheckSum:        0xC608680B
       Number:          11
   - Name:            foo
     Value:           0