Fix tests for Windows

We need to match file names with both forward and backward slashes.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@283407 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/tools/llvm-opt-report/basic.test b/test/tools/llvm-opt-report/basic.test
index de02064..9cab837 100644 (file)
--- a/test/tools/llvm-opt-report/basic.test
+++ b/test/tools/llvm-opt-report/basic.test
@@ -1,7 +1,7 @@
 RUN: llvm-opt-report -r %p %p/Inputs/or.yaml | FileCheck -strict-whitespace %s
 RUN: llvm-opt-report -s -r %p %p/Inputs/or.yaml | FileCheck -strict-whitespace -check-prefix=CHECK-SUCCINCT %s
 
-; CHECK: < {{.*}}/Inputs/or.c
+; CHECK: < {{.*[/\]}}or.c
 ; CHECK-NEXT:  2          | void bar();
 ; CHECK-NEXT:  3          | void foo() { bar(); }
 ; CHECK-NEXT:  4          | 
@@ -27,7 +27,7 @@ RUN: llvm-opt-report -s -r %p %p/Inputs/or.yaml | FileCheck -strict-whitespace -
 ; CHECK-NEXT: 22          | }
 ; CHECK-NEXT: 23          | 
 
-; CHECK: < {{.*}}/Inputs/or.h
+; CHECK: < {{.*[/\]}}or.h
 ; CHECK-NEXT:  2          | void TestH(int *res, int *c, int *d, int *p, int n) {
 ; CHECK-NEXT:  3          |   int i;
 ; CHECK-NEXT:  4          | 
@@ -48,7 +48,7 @@ RUN: llvm-opt-report -s -r %p %p/Inputs/or.yaml | FileCheck -strict-whitespace -
 ; CHECK-NEXT: 17          | }
 ; CHECK-NEXT: 18          | 
 
-; CHECK-SUCCINCT: < {{.*}}/Inputs/or.c
+; CHECK-SUCCINCT: < {{.*[/\]}}or.c
 CHECK-SUCCINCT-NEXT:  2     | void bar();
 CHECK-SUCCINCT-NEXT:  3     | void foo() { bar(); }
 CHECK-SUCCINCT-NEXT:  4     | 
@@ -74,7 +74,7 @@ CHECK-SUCCINCT-NEXT:    I   |                 ^
 CHECK-SUCCINCT-NEXT: 22     | }
 CHECK-SUCCINCT-NEXT: 23     | 
 
-CHECK-SUCCINCT: < {{.*}}/Inputs/or.h
+CHECK-SUCCINCT: < {{.*[/\]}}or.h
 CHECK-SUCCINCT-NEXT:  2     | void TestH(int *res, int *c, int *d, int *p, int n) {
 CHECK-SUCCINCT-NEXT:  3     |   int i;
 CHECK-SUCCINCT-NEXT:  4     | 

diff --git a/test/tools/llvm-opt-report/func-2.test b/test/tools/llvm-opt-report/func-2.test
index 13cd31a..b7f1eb1 100644 (file)
--- a/test/tools/llvm-opt-report/func-2.test
+++ b/test/tools/llvm-opt-report/func-2.test
@@ -1,7 +1,7 @@
 RUN: llvm-opt-report -r %p %p/Inputs/q2.yaml | FileCheck -strict-whitespace %s
 RUN: llvm-opt-report -s -r %p %p/Inputs/q2.yaml | FileCheck -strict-whitespace -check-prefix=CHECK-SUCCINCT %s
 
-; CHECK: < {{.*}}/Inputs/q2.c
+; CHECK: < {{.*[/\]}}q2.c
 ; CHECK-NEXT:  2         | void bar();
 ; CHECK-NEXT:  3         | void foo(int n) {
 ; CHECK-NEXT: {{\[\[}}
@@ -24,7 +24,7 @@ RUN: llvm-opt-report -s -r %p %p/Inputs/q2.yaml | FileCheck -strict-whitespace -
 ; CHECK-NEXT: 14         | }
 ; CHECK-NEXT: 15         | 
 
-; CHECK-SUCCINCT: < {{.*}}/Inputs/q2.c
+; CHECK-SUCCINCT: < {{.*[/\]}}q2.c
 ; CHECK-SUCCINCT-NEXT:  2     | void bar();
 ; CHECK-SUCCINCT-NEXT:  3     | void foo(int n) {
 ; CHECK-SUCCINCT-NEXT: {{\[\[}}

diff --git a/test/tools/llvm-opt-report/func-x.test b/test/tools/llvm-opt-report/func-x.test
index 475ca41..9231fa1 100644 (file)
--- a/test/tools/llvm-opt-report/func-x.test
+++ b/test/tools/llvm-opt-report/func-x.test
@@ -1,7 +1,7 @@
 RUN: llvm-opt-report -r %p %p/Inputs/qx.yaml | FileCheck -strict-whitespace %s
 RUN: llvm-opt-report -s -r %p %p/Inputs/qx.yaml | FileCheck -strict-whitespace -check-prefix=CHECK-SUCCINCT %s
 
-; CHECK: < {{.*}}/Inputs/q.cpp
+; CHECK: < {{.*[/\]}}q.cpp
 ; CHECK-NEXT:  2         | void bar();
 ; CHECK-NEXT:  3         | void foo(int n) {
 ; CHECK-NEXT: {{\[\[}}
@@ -22,7 +22,7 @@ RUN: llvm-opt-report -s -r %p %p/Inputs/qx.yaml | FileCheck -strict-whitespace -
 ; CHECK-NEXT: 14         | }
 ; CHECK-NEXT: 15         | 
 
-; CHECK-SUCCINCT: < {{.*}}/Inputs/q.cpp
+; CHECK-SUCCINCT: < {{.*[/\]}}q.cpp
 ; CHECK-SUCCINCT-NEXT:  2     | void bar();
 ; CHECK-SUCCINCT-NEXT:  3     | void foo(int n) {
 ; CHECK-SUCCINCT-NEXT: {{\[\[}}

diff --git a/test/tools/llvm-opt-report/func.test b/test/tools/llvm-opt-report/func.test
index 76665de..8e8c92f 100644 (file)
--- a/test/tools/llvm-opt-report/func.test
+++ b/test/tools/llvm-opt-report/func.test
@@ -1,7 +1,7 @@
 RUN: llvm-opt-report -r %p %p/Inputs/q.yaml | FileCheck -strict-whitespace %s
 RUN: llvm-opt-report -s -r %p %p/Inputs/q.yaml | FileCheck -strict-whitespace -check-prefix=CHECK-SUCCINCT %s
 
-; CHECK: < {{.*}}/Inputs/q.c
+; CHECK: < {{.*[/\]}}q.c
 ; CHECK-NEXT:  2         | void bar();
 ; CHECK-NEXT:  3         | void foo(int n) {
 ; CHECK-NEXT: {{\[\[}}
@@ -22,7 +22,7 @@ RUN: llvm-opt-report -s -r %p %p/Inputs/q.yaml | FileCheck -strict-whitespace -c
 ; CHECK-NEXT: 14         | }
 ; CHECK-NEXT: 15         | 
 
-; CHECK-SUCCINCT: < {{.*}}/Inputs/q.c
+; CHECK-SUCCINCT: < {{.*[/\]}}q.c
 ; CHECK-SUCCINCT-NEXT:  2     | void bar();
 ; CHECK-SUCCINCT-NEXT:  3     | void foo(int n) {
 ; CHECK-SUCCINCT-NEXT: {{\[\[}}