obj2yaml: Improve error reporting

Previously only the error codes were reported which
meant that useful information about malformed inputs
was not shown.

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

llvm-svn: 305609

3 files changed, 6 insertions, 2 deletions

diff --git a/llvm/test/Object/obj2yaml.test b/llvm/test/Object/obj2yaml.test
index 171488da78f..b89311db606 100644
--- a/llvm/test/Object/obj2yaml.test
+++ b/llvm/test/Object/obj2yaml.test
@@ -478,4 +478,4 @@ ELF-X86-64-UNWIND-NEXT:   AddressAlign:    0x0000000000000001
 ELF-X86-64-UNWIND-NEXT:   Content:         ''
 
 RUN: not obj2yaml %t.blah 2>&1 | FileCheck --check-prefix=ENOENT %s
-ENOENT: Error: '{{[Nn]}}o such file or directory'
+ENOENT: Error reading file: {{.*}}.blah: {{[Nn]}}o such file or directory
diff --git a/llvm/test/ObjectYAML/wasm/header_invalid_version.yaml b/llvm/test/ObjectYAML/wasm/header_invalid_version.yaml
index fa742db8cba..a7055f08e17 100644
--- a/llvm/test/ObjectYAML/wasm/header_invalid_version.yaml
+++ b/llvm/test/ObjectYAML/wasm/header_invalid_version.yaml
@@ -3,4 +3,4 @@
 FileHeader:
   Version:         0x00000002
 ...
-# CHECK: Error: 'Invalid data was encountered while parsing the file'
+# CHECK: Error reading file: <stdin>: Bad version number
diff --git a/llvm/test/tools/obj2yaml/invalid_input_file.test b/llvm/test/tools/obj2yaml/invalid_input_file.test
new file mode 100644
index 00000000000..573e753c8a8
--- /dev/null
+++ b/llvm/test/tools/obj2yaml/invalid_input_file.test
@@ -0,0 +1,4 @@
+# RUN: not obj2yaml  %p/path/does/not/exist 2>&1 | FileCheck %s
+
+# Don't check the OS-dependent message "No such file or directory".
+# CHECK: Error reading file: {{.*}}/path/does/not/exist: {{.*}}