[lit] Try to fix new tests that fail on Windows bots

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

diff --git a/utils/lit/tests/shtest-shell.py b/utils/lit/tests/shtest-shell.py
index 9a6f2aac0a43e3e9b9b6c6ea5c3c29e8a72c10e7..9b572d1bf6c0ef3a025a2d0da2d41d7022788742 100644 (file)
--- a/utils/lit/tests/shtest-shell.py
+++ b/utils/lit/tests/shtest-shell.py
@@ -46,10 +46,10 @@
 # CHECK-NEXT: ---
 # CHECK-NEXT: +++
 # CHECK-NEXT: @@
-# CHECK-NEXT: {{^ .f.o.o.$}}
-# CHECK-NEXT: {{^-.b.a.r.$}}
-# CHECK-NEXT: {{^\+.b.a.r..}}
-# CHECK-NEXT: {{^ .b.a.z.$}}
+# CHECK-NEXT: {{^ .+f.+o.+o.+$}}
+# CHECK-NEXT: {{^-.+b.+a.+r.+$}}
+# CHECK-NEXT: {{^\+.+b.+a.+r.+$}}
+# CHECK-NEXT: {{^ .+b.+a.+z.+$}}
 # CHECK: error: command failed with exit status: 1
 # CHECK: $ "true"
 
@@ -61,9 +61,9 @@
 # CHECK-NEXT: -foo
 # CHECK-NEXT: -bar
 # CHECK-NEXT: -baz
-# CHECK-NEXT: {{^\+.f.o.o.$}}
-# CHECK-NEXT: {{^\+.b.a.r..}}
-# CHECK-NEXT: {{^\+.b.a.z.$}}
+# CHECK-NEXT: {{^\+.+f.+o.+o.+$}}
+# CHECK-NEXT: {{^\+.+b.+a.+r.+$}}
+# CHECK-NEXT: {{^\+.+b.+a.+z.+$}}
 # CHECK: error: command failed with exit status: 1
 # CHECK: $ "true"
 
@@ -72,9 +72,9 @@
 # CHECK-NEXT: ---
 # CHECK-NEXT: +++
 # CHECK-NEXT: @@
-# CHECK-NEXT: {{^\-.f.o.o.$}}
-# CHECK-NEXT: {{^\-.b.a.r..}}
-# CHECK-NEXT: {{^\-.b.a.z.$}}
+# CHECK-NEXT: {{^\-.+f.+o.+o.+$}}
+# CHECK-NEXT: {{^\-.+b.+a.+r.+$}}
+# CHECK-NEXT: {{^\-.+b.+a.+z.+$}}
 # CHECK-NEXT: +foo
 # CHECK-NEXT: +bar
 # CHECK-NEXT: +baz
@@ -98,10 +98,10 @@
 # CHECK-NEXT: ---
 # CHECK-NEXT: +++
 # CHECK-NEXT: @@
-# CHECK-NEXT: {{^ .f.o.o.$}}
-# CHECK-NEXT: {{^-.b.a.r.$}}
-# CHECK-NEXT: {{^\+.b.a.r..}}
-# CHECK-NEXT: {{^ .b.a.z.$}}
+# CHECK-NEXT: {{^ .+f.+o.+o.+$}}
+# CHECK-NEXT: {{^-.+b.+a.+r.+$}}
+# CHECK-NEXT: {{^\+.+b.+a.+r.+$}}
+# CHECK-NEXT: {{^ .+b.+a.+z.+$}}
 # CHECK: error: command failed with exit status: 1
 # CHECK: $ "true"
 
@@ -115,9 +115,9 @@
 # CHECK-NEXT: -foo
 # CHECK-NEXT: -bar
 # CHECK-NEXT: -baz
-# CHECK-NEXT: {{^\+.f.o.o.$}}
-# CHECK-NEXT: {{^\+.b.a.r..}}
-# CHECK-NEXT: {{^\+.b.a.z.$}}
+# CHECK-NEXT: {{^\+.+f.+o.+o.+$}}
+# CHECK-NEXT: {{^\+.+b.+a.+r.+$}}
+# CHECK-NEXT: {{^\+.+b.+a.+z.+$}}
 # CHECK: error: command failed with exit status: 1
 # CHECK: $ "true"
 
@@ -126,9 +126,9 @@
 # CHECK-NEXT: ---
 # CHECK-NEXT: +++
 # CHECK-NEXT: @@
-# CHECK-NEXT: {{^\-.f.o.o.$}}
-# CHECK-NEXT: {{^\-.b.a.r..}}
-# CHECK-NEXT: {{^\-.b.a.z.$}}
+# CHECK-NEXT: {{^\-.+f.+o.+o.+$}}
+# CHECK-NEXT: {{^\-.+b.+a.+r.+$}}
+# CHECK-NEXT: {{^\-.+b.+a.+z.+$}}
 # CHECK-NEXT: +foo
 # CHECK-NEXT: +bar
 # CHECK-NEXT: +baz