From 74cf034805de5239952ee8f33f47d624cb82cca0 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Tue, 6 Dec 2016 22:02:21 +0000 Subject: [PATCH] Replace "|&" with "2>&1 |" to support bash pre-4 Summary: Old bash release (3.2) on SLES11 chokes on new redirection shortcut. Patch by Brian Cain. Reviewers: eugenis Subscribers: llvm-commits, kubabrecka Differential Revision: https://reviews.llvm.org/D27443 llvm-svn: 288854 --- compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch.cc | 4 ++-- compiler-rt/test/msan/Linux/obstack.cc | 2 +- compiler-rt/test/msan/Linux/process_vm_readv.cc | 2 +- compiler-rt/test/msan/fork.cc | 2 +- compiler-rt/test/msan/iconv.cc | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch.cc b/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch.cc index 8ae9df530f85..3a71862fb732 100644 --- a/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch.cc +++ b/compiler-rt/test/asan/TestCases/Linux/new_delete_mismatch.cc @@ -1,8 +1,8 @@ // Check that we report new[] vs delete as alloc-dealloc-mismatch and not as // new-delete-type-mismatch when -fsized-deallocation is enabled. -// RUN: %clangxx_asan -g %s -o %t && %env_asan_opts=alloc_dealloc_mismatch=1 not %run %t |& FileCheck %s -// RUN: %clangxx_asan -fsized-deallocation -g %s -o %t && %env_asan_opts=alloc_dealloc_mismatch=1 not %run %t |& FileCheck %s +// RUN: %clangxx_asan -g %s -o %t && %env_asan_opts=alloc_dealloc_mismatch=1 not %run %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -fsized-deallocation -g %s -o %t && %env_asan_opts=alloc_dealloc_mismatch=1 not %run %t 2>&1 | FileCheck %s #include diff --git a/compiler-rt/test/msan/Linux/obstack.cc b/compiler-rt/test/msan/Linux/obstack.cc index a042912cfa41..0a81d8704f1e 100644 --- a/compiler-rt/test/msan/Linux/obstack.cc +++ b/compiler-rt/test/msan/Linux/obstack.cc @@ -1,5 +1,5 @@ // RUN: %clangxx_msan -O0 -g %s -o %t && %run %t -// RUN: %clangxx_msan -O0 -g -DPOSITIVE %s -o %t && not %run %t |& FileCheck %s +// RUN: %clangxx_msan -O0 -g -DPOSITIVE %s -o %t && not %run %t 2>&1 | FileCheck %s #include #include diff --git a/compiler-rt/test/msan/Linux/process_vm_readv.cc b/compiler-rt/test/msan/Linux/process_vm_readv.cc index b61578d1bfda..0a0e0274b8a5 100644 --- a/compiler-rt/test/msan/Linux/process_vm_readv.cc +++ b/compiler-rt/test/msan/Linux/process_vm_readv.cc @@ -1,5 +1,5 @@ // RUN: %clangxx_msan -std=c++11 -O0 %s -o %t && %run %t -// RUN: %clangxx_msan -std=c++11 -O0 %s -o %t -DPOSITIVE && not %run %t |& FileCheck %s +// RUN: %clangxx_msan -std=c++11 -O0 %s -o %t -DPOSITIVE && not %run %t 2>&1 | FileCheck %s #include #include diff --git a/compiler-rt/test/msan/fork.cc b/compiler-rt/test/msan/fork.cc index e14ee811ab21..e4dc5490887c 100644 --- a/compiler-rt/test/msan/fork.cc +++ b/compiler-rt/test/msan/fork.cc @@ -3,7 +3,7 @@ // and verify that origin reads do not deadlock in the child process. // RUN: %clangxx_msan -std=c++11 -fsanitize-memory-track-origins=2 -g -O3 %s -o %t -// RUN: MSAN_OPTIONS=store_context_size=1000,origin_history_size=0,origin_history_per_stack_limit=0 %run %t |& FileCheck %s +// RUN: MSAN_OPTIONS=store_context_size=1000,origin_history_size=0,origin_history_per_stack_limit=0 %run %t 2>&1 | FileCheck %s // Fun fact: if test output is redirected to a file (as opposed to // being piped directly to FileCheck), we may lose some "done"s due to diff --git a/compiler-rt/test/msan/iconv.cc b/compiler-rt/test/msan/iconv.cc index c2da938169b3..e5fbbf9241e7 100644 --- a/compiler-rt/test/msan/iconv.cc +++ b/compiler-rt/test/msan/iconv.cc @@ -1,5 +1,5 @@ // RUN: %clangxx_msan -O0 -g %s -o %t && %run %t -// RUN: %clangxx_msan -O0 -g -DPOSITIVE %s -o %t && not %run %t |& FileCheck %s +// RUN: %clangxx_msan -O0 -g -DPOSITIVE %s -o %t && not %run %t 2>&1 | FileCheck %s #include #include