[PATCH] D65946: [llvm-readobj] - Remove depricated unwrapOrError(Expected<T> EO).

[James Henderson via Phabricator via llvm-commits]

jhenderson added inline comments.


================
Comment at: test/Object/invalid.test:229
 
-# INVALID-PH-ENTSIZE: error: invalid e_phentsize: 12336
+# INVALID-PH-ENTSIZE: error: '{{.*}}invalid-e_shnum.elf': invalid e_phentsize: 12336
 
----------------
Aside: it's rather weird that invalid-e_shnum is being used to test an invalid e_phentsize...!


================
Comment at: test/Object/invalid.test:247
 
-# INVALID-RELOC-SH-OFFSET: error: section [index 1] has a sh_offset (0x10000) + sh_size (0x0) that cannot be represented
+# INVALID-RELOC-SH-OFFSET: error: '{{.*}}': section [index 1] has a sh_offset (0x10000) + sh_size (0x0) that cannot be represented
 
----------------
I think you can use -D here, right, like in %t10 case above and others?


================
Comment at: test/tools/yaml2obj/elf-sht-symtab-shndx.yaml:6
 # RUN: yaml2obj --docnum=1 %s -o %t1
-# RUN: not llvm-readobj --symbols 2>&1 %t1 | FileCheck %s --check-prefix=CASE1
+# RUN: not llvm-readobj --symbols 2>&1 %t1 | FileCheck --DFILE=%t1 %s --check-prefix=CASE1
 
----------------
Nit: use single-dash for -D.


================
Comment at: test/tools/yaml2obj/elf-sht-symtab-shndx.yaml:74
 # RUN: yaml2obj --docnum=3 %s -o %t3
-# RUN: not llvm-readobj --symbols 2>&1 %t3 | FileCheck %s --check-prefix=CASE3
+# RUN: not llvm-readobj --symbols 2>&1 %t3 | FileCheck %s --DFILE=%t3 --check-prefix=CASE3
 
----------------
Ditto


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D65946/new/

https://reviews.llvm.org/D65946