From 642aa224ddf9c8753e9bf99eb55e22f3bb867a1e Mon Sep 17 00:00:00 2001 From: Alex Brachet Date: Wed, 7 Aug 2019 03:18:23 +0000 Subject: [PATCH] Fixes failing test cases on Windows for rL368119 Windows test cases were failing because the executable is called yaml2obj.exe not just yaml2obj. I removed FileCheck patterns including yaml2obj so they start matching at the error message not the program name. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@368120 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/tools/yaml2obj/empty-or-invalid-doc.yaml | 4 ++-- test/tools/yaml2obj/invalid-docnum.test | 4 ++-- test/tools/yaml2obj/missing_document_tag.yaml | 2 +- test/tools/yaml2obj/multi-doc.test | 2 +- test/tools/yaml2obj/section-size-content.yaml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/tools/yaml2obj/empty-or-invalid-doc.yaml b/test/tools/yaml2obj/empty-or-invalid-doc.yaml index de79f4162e3..9f451cab5a5 100644 --- a/test/tools/yaml2obj/empty-or-invalid-doc.yaml +++ b/test/tools/yaml2obj/empty-or-invalid-doc.yaml @@ -2,7 +2,7 @@ # RUN: echo -n "" | not yaml2obj 2>&1 | FileCheck %s # RUN: echo " " | not yaml2obj 2>&1 | FileCheck %s # RUN: echo " " | not yaml2obj 2>&1 | FileCheck %s -# CHECK: yaml2obj: error: Unknown document type! +# CHECK: error: Unknown document type! # RUN: echo -e -n "\xff" | not yaml2obj 2>&1 | FileCheck %s --check-prefix=INVALID -# INVALID: yaml2obj: error: Failed to parse YAML input! +# INVALID: error: Failed to parse YAML input! diff --git a/test/tools/yaml2obj/invalid-docnum.test b/test/tools/yaml2obj/invalid-docnum.test index 0f796024c62..0a533468eda 100644 --- a/test/tools/yaml2obj/invalid-docnum.test +++ b/test/tools/yaml2obj/invalid-docnum.test @@ -2,10 +2,10 @@ ## greater than the number of YAML inputs in the file. # RUN: not yaml2obj %s --docnum=3 2>&1 | FileCheck %s -# CHECK: yaml2obj: error: Cannot find the 3rd document +# CHECK: error: Cannot find the 3rd document # RUN: not yaml2obj %s --docnum=76768677 2>&1 | FileCheck %s --check-prefix=TWO -# TWO: yaml2obj: error: Cannot find the 76768677th document +# TWO: error: Cannot find the 76768677th document --- !ELF FileHeader: diff --git a/test/tools/yaml2obj/missing_document_tag.yaml b/test/tools/yaml2obj/missing_document_tag.yaml index d41e7991bb8..09cdc4bff65 100644 --- a/test/tools/yaml2obj/missing_document_tag.yaml +++ b/test/tools/yaml2obj/missing_document_tag.yaml @@ -6,4 +6,4 @@ DummyData: ... # CHECK: YAML:4:1: error: YAML Object File missing document type tag! -# CHECK: yaml2obj: error: Failed to parse YAML input! +# CHECK: error: Failed to parse YAML input! diff --git a/test/tools/yaml2obj/multi-doc.test b/test/tools/yaml2obj/multi-doc.test index 9d3762b0291..0b794e10067 100644 --- a/test/tools/yaml2obj/multi-doc.test +++ b/test/tools/yaml2obj/multi-doc.test @@ -16,7 +16,7 @@ # DOC2: Name: _sym2 # DOC3: Name: _sym3 # DOC4: Name: _sym4 -# DOC5: yaml2obj: error: Cannot find the 5th document +# DOC5: error: Cannot find the 5th document --- !ELF FileHeader: !FileHeader diff --git a/test/tools/yaml2obj/section-size-content.yaml b/test/tools/yaml2obj/section-size-content.yaml index b57526abe71..5b231a8362a 100644 --- a/test/tools/yaml2obj/section-size-content.yaml +++ b/test/tools/yaml2obj/section-size-content.yaml @@ -175,4 +175,4 @@ Sections: # ERR2: error: Section size must be greater than or equal to the content size # ERR2-NEXT: - Name: .data # ERR2-NEXT: ^ -# ERR2-NEXT: yaml2obj: error: Failed to parse YAML input! +# ERR2-NEXT: error: Failed to parse YAML input! -- 2.50.1