[llvm] r309198 - [lit] Fix shtest-output-printing.py on Windows by matching either / or \\

Reid Kleckner via llvm-commits llvm-commits at lists.llvm.org
Wed Jul 26 15:11:30 PDT 2017


Author: rnk
Date: Wed Jul 26 15:11:30 2017
New Revision: 309198

URL: http://llvm.org/viewvc/llvm-project?rev=309198&view=rev
Log:
[lit] Fix shtest-output-printing.py on Windows by matching either / or \\

Fixes PR33938

Modified:
    llvm/trunk/utils/lit/tests/shtest-output-printing.py

Modified: llvm/trunk/utils/lit/tests/shtest-output-printing.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/shtest-output-printing.py?rev=309198&r1=309197&r2=309198&view=diff
==============================================================================
--- llvm/trunk/utils/lit/tests/shtest-output-printing.py (original)
+++ llvm/trunk/utils/lit/tests/shtest-output-printing.py Wed Jul 26 15:11:30 2017
@@ -1,8 +1,5 @@
 # Check the various features of the ShTest format.
 #
-# PR33938
-# XFAIL: windows
-#
 # RUN: not %{lit} -j 1 -v %{inputs}/shtest-output-printing > %t.out
 # RUN: FileCheck --input-file %t.out %s
 #
@@ -25,7 +22,7 @@
 # CHECK-NEXT: hi
 #
 # CHECK:      $ "wc" "missing-file"
-# CHECK-NEXT: # redirected output from '{{.*}}/basic.txt.tmp.out':
+# CHECK-NEXT: # redirected output from '{{.*(/|\\\\)}}basic.txt.tmp.out':
 # CHECK-NEXT: missing-file{{.*}} No such file or directory
 # CHECK:      note: command had no output on stdout or stderr
 # CHECK-NEXT: error: command failed with exit status: 1




More information about the llvm-commits mailing list