Index: llvm/trunk/utils/lit/tests/Inputs/shtest-output-printing/basic.txt
===================================================================
--- llvm/trunk/utils/lit/tests/Inputs/shtest-output-printing/basic.txt
+++ llvm/trunk/utils/lit/tests/Inputs/shtest-output-printing/basic.txt
@@ -1,3 +1,3 @@
 # RUN: true
 # RUN: echo hi
-# RUN: wc missing-file &> %t.out
+# RUN: not not wc missing-file &> %t.out
Index: llvm/trunk/utils/lit/tests/shtest-format.py
===================================================================
--- llvm/trunk/utils/lit/tests/shtest-format.py
+++ llvm/trunk/utils/lit/tests/shtest-format.py
@@ -18,7 +18,7 @@
 # CHECK-NEXT: line 2: failed test output on stdout
 # CHECK: Command Output (stderr):
 # CHECK-NEXT: --
-# CHECK-NEXT: cat{{(\.exe)?}}: does-not-exist: No such file or directory
+# CHECK-NEXT: cat{{(\.exe)?}}: {{cannot open does-not-exist|does-not-exist: No such file or directory}}
 # CHECK: --
 
 # CHECK: FAIL: shtest-format :: external_shell/fail_with_bad_encoding.txt
Index: llvm/trunk/utils/lit/tests/shtest-output-printing.py
===================================================================
--- llvm/trunk/utils/lit/tests/shtest-output-printing.py
+++ llvm/trunk/utils/lit/tests/shtest-output-printing.py
@@ -24,8 +24,8 @@
 # CHECK-NEXT: hi
 #
 # CHECK:      $ ":" "RUN: at line 3"
-# CHECK-NEXT: $ "wc" "missing-file"
+# CHECK-NEXT: $ "not" "not" "wc" "missing-file"
 # CHECK-NEXT: # redirected output from '{{.*(/|\\\\)}}basic.txt.tmp.out':
-# CHECK-NEXT: missing-file{{.*}} No such file or directory
+# CHECK-NEXT: {{cannot open missing-file|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