[msan] Fix msan tests with pipefail option.

llvm-svn: 187485

diff --git a/compiler-rt/lib/msan/lit_tests/dso-origin.cc b/compiler-rt/lib/msan/lit_tests/dso-origin.cc
index 6ca482d..13661c6 100644 (file)
--- a/compiler-rt/lib/msan/lit_tests/dso-origin.cc
+++ b/compiler-rt/lib/msan/lit_tests/dso-origin.cc
@@ -2,7 +2,7 @@
 // Test that origin tracking is enabled at runtime.
 // RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %p/SharedLibs/dso-origin-so.cc \
 // RUN:     -fPIC -shared -o %t-so.so
-// RUN: %clangxx_msan -m64 -O0 %s %t-so.so -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -m64 -O0 %s %t-so.so -o %t && not %t 2>&1 | FileCheck %s
 
 #include <stdlib.h>
 

diff --git a/compiler-rt/lib/msan/lit_tests/ioctl_custom.cc b/compiler-rt/lib/msan/lit_tests/ioctl_custom.cc
index b4a56dc..94ed528 100644 (file)
--- a/compiler-rt/lib/msan/lit_tests/ioctl_custom.cc
+++ b/compiler-rt/lib/msan/lit_tests/ioctl_custom.cc
@@ -1,8 +1,8 @@
 // RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %t
 // RUN: %clangxx_msan -m64 -O3 -g %s -o %t && %t
 
-// RUN: %clangxx_msan -DPOSITIVE -m64 -O0 -g %s -o %t && %t 2>&1 | FileCheck %s
-// RUN: %clangxx_msan -DPOSITIVE -m64 -O3 -g %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -DPOSITIVE -m64 -O0 -g %s -o %t && not %t 2>&1 | FileCheck %s
+// RUN: %clangxx_msan -DPOSITIVE -m64 -O3 -g %s -o %t && not %t 2>&1 | FileCheck %s
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/compiler-rt/lib/msan/lit_tests/lit.cfg b/compiler-rt/lib/msan/lit_tests/lit.cfg
index a49a172..bc19b74 100644 (file)
--- a/compiler-rt/lib/msan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/msan/lit_tests/lit.cfg
@@ -67,7 +67,6 @@ config.environment['MSAN_SYMBOLIZER_PATH'] = config.llvm_symbolizer_path
 
 # Default test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp']
-config.pipefail = False
 
 # MemorySanitizer tests are currently supported on Linux only.
 if config.host_os not in ['Linux']: