From 1ea380f6932468b203bfae94f76a8299458fa191 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Wed, 31 Jul 2013 09:14:55 +0000 Subject: [PATCH] [msan] Fix msan tests with pipefail option. llvm-svn: 187485 --- compiler-rt/lib/msan/lit_tests/dso-origin.cc | 2 +- compiler-rt/lib/msan/lit_tests/ioctl_custom.cc | 4 ++-- compiler-rt/lib/msan/lit_tests/lit.cfg | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler-rt/lib/msan/lit_tests/dso-origin.cc b/compiler-rt/lib/msan/lit_tests/dso-origin.cc index 6ca482dbc6c1..13661c65e744 100644 --- 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 diff --git a/compiler-rt/lib/msan/lit_tests/ioctl_custom.cc b/compiler-rt/lib/msan/lit_tests/ioctl_custom.cc index b4a56dcd77a5..94ed528c70b9 100644 --- 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 #include diff --git a/compiler-rt/lib/msan/lit_tests/lit.cfg b/compiler-rt/lib/msan/lit_tests/lit.cfg index a49a172c01c1..bc19b740c0de 100644 --- 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']: