[llvm] r283407 - Fix tests for Windows
Hal Finkel via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 5 15:48:14 PDT 2016
Author: hfinkel
Date: Wed Oct 5 17:48:13 2016
New Revision: 283407
URL: http://llvm.org/viewvc/llvm-project?rev=283407&view=rev
Log:
Fix tests for Windows
We need to match file names with both forward and backward slashes.
Modified:
llvm/trunk/test/tools/llvm-opt-report/basic.test
llvm/trunk/test/tools/llvm-opt-report/func-2.test
llvm/trunk/test/tools/llvm-opt-report/func-x.test
llvm/trunk/test/tools/llvm-opt-report/func.test
Modified: llvm/trunk/test/tools/llvm-opt-report/basic.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-opt-report/basic.test?rev=283407&r1=283406&r2=283407&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-opt-report/basic.test (original)
+++ llvm/trunk/test/tools/llvm-opt-report/basic.test Wed Oct 5 17:48:13 2016
@@ -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/
; 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/
; 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 |
Modified: llvm/trunk/test/tools/llvm-opt-report/func-2.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-opt-report/func-2.test?rev=283407&r1=283406&r2=283407&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-opt-report/func-2.test (original)
+++ llvm/trunk/test/tools/llvm-opt-report/func-2.test Wed Oct 5 17:48:13 2016
@@ -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/
; 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: {{\[\[}}
Modified: llvm/trunk/test/tools/llvm-opt-report/func-x.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-opt-report/func-x.test?rev=283407&r1=283406&r2=283407&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-opt-report/func-x.test (original)
+++ llvm/trunk/test/tools/llvm-opt-report/func-x.test Wed Oct 5 17:48:13 2016
@@ -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/
; 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: {{\[\[}}
Modified: llvm/trunk/test/tools/llvm-opt-report/func.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-opt-report/func.test?rev=283407&r1=283406&r2=283407&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-opt-report/func.test (original)
+++ llvm/trunk/test/tools/llvm-opt-report/func.test Wed Oct 5 17:48:13 2016
@@ -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/
; 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: {{\[\[}}
More information about the llvm-commits
mailing list