[llvm] r368120 - Fixes failing test cases on Windows for rL368119

Alex Brachet via llvm-commits llvm-commits at lists.llvm.org
Tue Aug 6 20:18:23 PDT 2019


Author: abrachet
Date: Tue Aug  6 20:18:23 2019
New Revision: 368120

URL: http://llvm.org/viewvc/llvm-project?rev=368120&view=rev
Log:
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.

Modified:
    llvm/trunk/test/tools/yaml2obj/empty-or-invalid-doc.yaml
    llvm/trunk/test/tools/yaml2obj/invalid-docnum.test
    llvm/trunk/test/tools/yaml2obj/missing_document_tag.yaml
    llvm/trunk/test/tools/yaml2obj/multi-doc.test
    llvm/trunk/test/tools/yaml2obj/section-size-content.yaml

Modified: llvm/trunk/test/tools/yaml2obj/empty-or-invalid-doc.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/yaml2obj/empty-or-invalid-doc.yaml?rev=368120&r1=368119&r2=368120&view=diff
==============================================================================
--- llvm/trunk/test/tools/yaml2obj/empty-or-invalid-doc.yaml (original)
+++ llvm/trunk/test/tools/yaml2obj/empty-or-invalid-doc.yaml Tue Aug  6 20:18:23 2019
@@ -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!

Modified: llvm/trunk/test/tools/yaml2obj/invalid-docnum.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/yaml2obj/invalid-docnum.test?rev=368120&r1=368119&r2=368120&view=diff
==============================================================================
--- llvm/trunk/test/tools/yaml2obj/invalid-docnum.test (original)
+++ llvm/trunk/test/tools/yaml2obj/invalid-docnum.test Tue Aug  6 20:18:23 2019
@@ -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:

Modified: llvm/trunk/test/tools/yaml2obj/missing_document_tag.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/yaml2obj/missing_document_tag.yaml?rev=368120&r1=368119&r2=368120&view=diff
==============================================================================
--- llvm/trunk/test/tools/yaml2obj/missing_document_tag.yaml (original)
+++ llvm/trunk/test/tools/yaml2obj/missing_document_tag.yaml Tue Aug  6 20:18:23 2019
@@ -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!

Modified: llvm/trunk/test/tools/yaml2obj/multi-doc.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/yaml2obj/multi-doc.test?rev=368120&r1=368119&r2=368120&view=diff
==============================================================================
--- llvm/trunk/test/tools/yaml2obj/multi-doc.test (original)
+++ llvm/trunk/test/tools/yaml2obj/multi-doc.test Tue Aug  6 20:18:23 2019
@@ -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

Modified: llvm/trunk/test/tools/yaml2obj/section-size-content.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/yaml2obj/section-size-content.yaml?rev=368120&r1=368119&r2=368120&view=diff
==============================================================================
--- llvm/trunk/test/tools/yaml2obj/section-size-content.yaml (original)
+++ llvm/trunk/test/tools/yaml2obj/section-size-content.yaml Tue Aug  6 20:18:23 2019
@@ -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!




More information about the llvm-commits mailing list