From 5da53436d526162bf696ba40df3841a6b5992fbd Mon Sep 17 00:00:00 2001
From: Chandler Carruth <chandlerc@gmail.com>
Date: Mon, 2 Jul 2012 18:37:59 +0000
Subject: [PATCH] Convert the uses of '|&' to use '2>&1 |' instead, which works
 on old versions of Bash. In addition, I can back out the change to the lit
 built-in shell test runner to support this.

This should fix the majority of fallout on Darwin, but I suspect there
will be a few straggling issues.

llvm-svn: 159544
---
 llvm/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll   |  2 +-
 llvm/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll  |  2 +-
 .../Analysis/BasicAA/2006-03-03-BadArraySubscript.ll   |  2 +-
 .../Analysis/BasicAA/2007-08-01-NoAliasAndCalls.ll     |  2 +-
 llvm/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll |  2 +-
 llvm/test/Analysis/BasicAA/2008-11-23-NoaliasRet.ll    |  2 +-
 .../Analysis/BasicAA/2009-10-13-GEP-BaseNoAlias.ll     |  2 +-
 .../BasicAA/2010-09-15-GEP-SignedArithmetic.ll         |  2 +-
 llvm/test/Analysis/BasicAA/args-rets-allocas-loads.ll  |  2 +-
 llvm/test/Analysis/BasicAA/constant-over-index.ll      |  2 +-
 llvm/test/Analysis/BasicAA/dag.ll                      |  2 +-
 llvm/test/Analysis/BasicAA/empty.ll                    |  2 +-
 llvm/test/Analysis/BasicAA/gep-alias.ll                |  2 +-
 llvm/test/Analysis/BasicAA/getmodrefinfo-cs-cs.ll      |  2 +-
 llvm/test/Analysis/BasicAA/must-and-partial.ll         |  2 +-
 llvm/test/Analysis/BasicAA/phi-aa.ll                   |  2 +-
 llvm/test/Analysis/BasicAA/phi-and-select.ll           |  2 +-
 llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll  |  2 +-
 .../test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll |  2 +-
 llvm/test/Analysis/CallGraph/no-intrinsics.ll          |  2 +-
 llvm/test/Analysis/RegionInfo/block_sort.ll            |  6 +++---
 llvm/test/Analysis/RegionInfo/cond_loop.ll             |  6 +++---
 llvm/test/Analysis/RegionInfo/condition_complicated.ll |  6 +++---
 .../Analysis/RegionInfo/condition_complicated_2.ll     |  6 +++---
 .../test/Analysis/RegionInfo/condition_forward_edge.ll |  6 +++---
 llvm/test/Analysis/RegionInfo/condition_same_exit.ll   |  6 +++---
 llvm/test/Analysis/RegionInfo/condition_simple.ll      |  6 +++---
 llvm/test/Analysis/RegionInfo/exit_in_condition.ll     |  6 +++---
 llvm/test/Analysis/RegionInfo/infinite_loop.ll         |  2 +-
 llvm/test/Analysis/RegionInfo/infinite_loop_2.ll       |  6 +++---
 llvm/test/Analysis/RegionInfo/infinite_loop_3.ll       |  6 +++---
 llvm/test/Analysis/RegionInfo/infinite_loop_4.ll       |  6 +++---
 llvm/test/Analysis/RegionInfo/loop_with_condition.ll   |  6 +++---
 llvm/test/Analysis/RegionInfo/loops_1.ll               |  6 +++---
 llvm/test/Analysis/RegionInfo/loops_2.ll               |  6 +++---
 llvm/test/Analysis/RegionInfo/mix_1.ll                 |  6 +++---
 llvm/test/Analysis/RegionInfo/multiple_exiting_edge.ll |  4 ++--
 llvm/test/Analysis/RegionInfo/nested_loops.ll          |  6 +++---
 llvm/test/Analysis/RegionInfo/next.ll                  |  6 +++---
 llvm/test/Analysis/RegionInfo/paper.ll                 |  6 +++---
 llvm/test/Analysis/RegionInfo/two_loops_same_header.ll |  6 +++---
 .../ScalarEvolution/2008-07-12-UnneededSelect1.ll      |  2 +-
 .../ScalarEvolution/2008-07-12-UnneededSelect2.ll      |  2 +-
 .../ScalarEvolution/2008-11-18-LessThanOrEqual.ll      |  2 +-
 .../Analysis/ScalarEvolution/2008-11-18-Stride2.ll     |  2 +-
 .../ScalarEvolution/2008-12-14-StrideAndSigned.ll      |  2 +-
 .../Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll |  2 +-
 llvm/test/Analysis/ScalarEvolution/scev-aa.ll          |  2 +-
 llvm/test/Assembler/2003-11-24-SymbolTableCrash.ll     |  2 +-
 .../test/Assembler/2004-03-30-UnclosedFunctionCrash.ll |  2 +-
 llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll     |  2 +-
 llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll   |  2 +-
 llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll       |  2 +-
 llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll      |  2 +-
 llvm/test/Assembler/2008-02-18-IntPointerCrash.ll      |  2 +-
 llvm/test/Assembler/2008-09-02-FunctionNotes2.ll       |  2 +-
 llvm/test/Assembler/extractvalue-invalid-idx.ll        |  2 +-
 llvm/test/Assembler/insertvalue-invalid-idx.ll         |  2 +-
 llvm/test/Assembler/invalid_cast.ll                    |  2 +-
 llvm/test/Assembler/invalid_cast2.ll                   |  2 +-
 llvm/test/CodeGen/ARM/2007-03-13-InstrSched.ll         |  2 +-
 llvm/test/CodeGen/ARM/2011-12-14-machine-sink.ll       |  2 +-
 llvm/test/CodeGen/ARM/addrmode.ll                      |  2 +-
 llvm/test/CodeGen/Generic/print-after.ll               |  2 +-
 llvm/test/CodeGen/Generic/print-machineinstrs.ll       |  6 +++---
 llvm/test/CodeGen/PowerPC/iabs.ll                      |  2 +-
 llvm/test/CodeGen/PowerPC/lsr-postinc-pos.ll           |  2 +-
 llvm/test/CodeGen/PowerPC/rlwimi3.ll                   |  2 +-
 llvm/test/CodeGen/Thumb/iabs.ll                        |  2 +-
 llvm/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.ll  |  2 +-
 llvm/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll      |  2 +-
 llvm/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll |  2 +-
 llvm/test/CodeGen/X86/2006-05-02-InstrSched1.ll        |  2 +-
 llvm/test/CodeGen/X86/2006-05-02-InstrSched2.ll        |  2 +-
 llvm/test/CodeGen/X86/2006-05-11-InstrSched.ll         |  2 +-
 llvm/test/CodeGen/X86/2008-02-18-TailMergingBug.ll     |  2 +-
 llvm/test/CodeGen/X86/2008-10-27-CoalescerBug.ll       |  2 +-
 llvm/test/CodeGen/X86/2009-02-25-CommuteBug.ll         |  2 +-
 llvm/test/CodeGen/X86/2009-02-26-MachineLICMBug.ll     |  2 +-
 llvm/test/CodeGen/X86/2009-04-16-SpillerUnfold.ll      |  2 +-
 llvm/test/CodeGen/X86/2010-01-19-OptExtBug.ll          |  2 +-
 llvm/test/CodeGen/X86/2011-06-12-FastAllocSpill.ll     |  2 +-
 llvm/test/CodeGen/X86/2012-03-26-PostRALICMBug.ll      |  2 +-
 llvm/test/CodeGen/X86/MachineSink-PHIUse.ll            |  2 +-
 llvm/test/CodeGen/X86/convert-2-addr-3-addr-inc64.ll   |  4 ++--
 llvm/test/CodeGen/X86/dagcombine-cse.ll                |  2 +-
 llvm/test/CodeGen/X86/hoist-invariant-load.ll          |  2 +-
 llvm/test/CodeGen/X86/label-redefinition.ll            |  2 +-
 llvm/test/CodeGen/X86/phi-immediate-factoring.ll       |  2 +-
 llvm/test/CodeGen/X86/pr3522.ll                        |  2 +-
 llvm/test/CodeGen/X86/regpressure.ll                   |  2 +-
 llvm/test/CodeGen/X86/sse_reload_fold.ll               |  2 +-
 llvm/test/CodeGen/X86/twoaddr-coalesce-2.ll            |  2 +-
 llvm/test/CodeGen/X86/twoaddr-pass-sink.ll             |  2 +-
 llvm/test/DebugInfo/printdbginfo2.ll                   |  2 +-
 llvm/test/Feature/globalredefinition3.ll               |  2 +-
 llvm/test/Feature/load_module.ll                       |  2 +-
 llvm/test/Linker/2003-08-24-InheritPtrSize.ll          |  2 +-
 llvm/test/Linker/link-messages.ll                      |  2 +-
 llvm/test/Linker/module-flags-4-a.ll                   |  2 +-
 llvm/test/Linker/module-flags-5-a.ll                   |  2 +-
 llvm/test/Linker/module-flags-6-a.ll                   |  2 +-
 llvm/test/Linker/redefinition.ll                       |  4 ++--
 llvm/test/MC/AsmParser/purgem.s                        |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-BFI-arm.txt      |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-Bcc-thumb.txt    |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-CPS2p-arm.txt    |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-CPS3p-arm.txt    |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-DMB-thumb.txt    |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-DSB-arm.txt      |  2 +-
 .../test/MC/Disassembler/ARM/invalid-IT-CBNZ-thumb.txt |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-IT-CC15.txt      |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-IT-thumb.txt     |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-LDC-form-arm.txt |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-LDM-thumb.txt    |  2 +-
 .../test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt |  2 +-
 .../MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt     |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-LDR_POST-arm.txt |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-LDR_PRE-arm.txt  |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-LDRrs-arm.txt    |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-MCR-arm.txt      |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-MOVTi16-arm.txt  |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-MOVr-arm.txt     |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-MOVs-LSL-arm.txt |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-MOVs-arm.txt     |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-MRRC2-arm.txt    |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-MSRi-arm.txt     |  2 +-
 .../MC/Disassembler/ARM/invalid-RFEorLDMIA-arm.txt     |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-SBFX-arm.txt     |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-SMLAD-arm.txt    |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-SRS-arm.txt      |  2 +-
 .../MC/Disassembler/ARM/invalid-STMIA_UPD-thumb.txt    |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-SXTB-arm.txt     |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-UMAAL-arm.txt    |  2 +-
 .../MC/Disassembler/ARM/invalid-VLD1DUPq8_UPD-arm.txt  |  2 +-
 .../Disassembler/ARM/invalid-VLD3DUPd32_UPD-thumb.txt  |  2 +-
 .../MC/Disassembler/ARM/invalid-VLDMSDB_UPD-arm.txt    |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-VQADD-arm.txt    |  2 +-
 .../ARM/invalid-VST1d8Twb_register-thumb.txt           |  2 +-
 .../MC/Disassembler/ARM/invalid-VST2b32_UPD-arm.txt    |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-t2Bcc-thumb.txt  |  2 +-
 .../test/MC/Disassembler/ARM/invalid-t2LDRBT-thumb.txt |  2 +-
 .../MC/Disassembler/ARM/invalid-t2LDREXD-thumb.txt     |  2 +-
 .../MC/Disassembler/ARM/invalid-t2LDRSHi12-thumb.txt   |  2 +-
 .../MC/Disassembler/ARM/invalid-t2LDRSHi8-thumb.txt    |  2 +-
 llvm/test/MC/Disassembler/ARM/invalid-t2PUSH-thumb.txt |  2 +-
 .../MC/Disassembler/ARM/invalid-t2STRD_PRE-thumb.txt   |  2 +-
 .../MC/Disassembler/ARM/invalid-t2STREXB-thumb.txt     |  2 +-
 .../MC/Disassembler/ARM/invalid-t2STREXD-thumb.txt     |  2 +-
 .../MC/Disassembler/ARM/invalid-t2STR_POST-thumb.txt   |  2 +-
 llvm/test/MC/Disassembler/ARM/ldrd-armv4.txt           |  4 ++--
 .../test/MC/Disassembler/ARM/unpredictable-ADC-arm.txt |  2 +-
 .../MC/Disassembler/ARM/unpredictable-ADDREXT3-arm.txt |  2 +-
 .../MC/Disassembler/ARM/unpredictable-AExtI-arm.txt    |  4 ++--
 .../MC/Disassembler/ARM/unpredictable-AI1cmp-arm.txt   |  2 +-
 .../test/MC/Disassembler/ARM/unpredictable-LDR-arm.txt |  2 +-
 .../MC/Disassembler/ARM/unpredictable-LDRD-arm.txt     |  2 +-
 .../MC/Disassembler/ARM/unpredictable-LSL-regform.txt  |  2 +-
 .../MC/Disassembler/ARM/unpredictable-MRRC2-arm.txt    |  2 +-
 .../test/MC/Disassembler/ARM/unpredictable-MRS-arm.txt |  2 +-
 .../test/MC/Disassembler/ARM/unpredictable-MUL-arm.txt |  2 +-
 .../test/MC/Disassembler/ARM/unpredictable-RSC-arm.txt |  2 +-
 .../test/MC/Disassembler/ARM/unpredictable-SEL-arm.txt |  2 +-
 .../MC/Disassembler/ARM/unpredictable-SHADD16-arm.txt  |  2 +-
 .../MC/Disassembler/ARM/unpredictable-SSAT-arm.txt     |  2 +-
 .../MC/Disassembler/ARM/unpredictable-STRBrs-arm.txt   |  2 +-
 .../MC/Disassembler/ARM/unpredictable-UQADD8-arm.txt   |  2 +-
 .../test/MC/Disassembler/ARM/unpredictable-swp-arm.txt |  2 +-
 llvm/test/MC/Disassembler/ARM/unpredictables-thumb.txt |  2 +-
 llvm/test/MC/Disassembler/X86/enhanced.txt             |  2 +-
 llvm/test/MC/Disassembler/X86/invalid-VEX-vvvv.txt     |  2 +-
 llvm/test/MC/Disassembler/X86/invalid-cmp-imm.txt      |  2 +-
 llvm/test/MC/Disassembler/X86/truncated-input.txt      |  2 +-
 llvm/test/Other/invalid-commandline-option.ll          |  2 +-
 llvm/test/Other/lint.ll                                |  2 +-
 llvm/test/Other/optimize-options.ll                    | 10 +++++-----
 llvm/test/Transforms/GVN/nonescaping-malloc.ll         |  2 +-
 llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll       |  2 +-
 llvm/test/Transforms/Inline/delete-call.ll             |  4 ++--
 llvm/test/Transforms/LICM/hoist-invariant-load.ll      |  2 +-
 .../Transforms/LoopUnswitch/2008-11-03-Invariant.ll    |  2 +-
 llvm/test/Transforms/MergeFunc/phi-speculation1.ll     |  2 +-
 llvm/test/Transforms/MergeFunc/phi-speculation2.ll     |  2 +-
 llvm/test/Transforms/MergeFunc/vector.ll               |  2 +-
 llvm/test/Transforms/TailCallElim/ackermann.ll         |  2 +-
 llvm/test/Transforms/TailCallElim/dup_tail.ll          |  2 +-
 .../TailDup/2008-06-11-AvoidDupLoopHeader.ll           |  2 +-
 llvm/test/Verifier/2002-04-13-RetTypes.ll              |  2 +-
 llvm/test/Verifier/2002-11-05-GetelementptrPointers.ll |  2 +-
 llvm/test/Verifier/2006-07-11-StoreStruct.ll           |  2 +-
 llvm/test/Verifier/2006-12-12-IntrinsicDefine.ll       |  2 +-
 llvm/test/Verifier/2008-03-01-AllocaSized.ll           |  2 +-
 llvm/test/Verifier/2008-08-22-MemCpyAlignment.ll       |  2 +-
 llvm/test/Verifier/2008-11-15-RetVoid.ll               |  2 +-
 llvm/test/Verifier/AmbiguousPhi.ll                     |  2 +-
 llvm/test/Verifier/PhiGrouping.ll                      |  2 +-
 llvm/test/Verifier/SelfReferential.ll                  |  2 +-
 llvm/test/Verifier/aliasing-chain.ll                   |  2 +-
 llvm/test/Verifier/cttz-undef-arg.ll                   |  2 +-
 llvm/test/Verifier/dominates.ll                        |  2 +-
 llvm/test/Verifier/fpmath.ll                           |  2 +-
 llvm/test/Verifier/invoke.ll                           |  2 +-
 llvm/test/Verifier/range-1.ll                          |  2 +-
 llvm/test/YAMLParser/spec-05-02-utf8.data              |  2 +-
 llvm/test/YAMLParser/spec-05-10.data                   |  2 +-
 llvm/test/YAMLParser/spec-05-12.data                   |  2 +-
 llvm/test/YAMLParser/spec-05-15.data                   |  2 +-
 llvm/test/YAMLParser/spec-07-03.data                   |  2 +-
 llvm/test/YAMLParser/spec-07-05.data                   |  2 +-
 llvm/test/YAMLParser/spec-08-04.data                   |  2 +-
 llvm/test/YAMLParser/spec-08-06.data                   |  2 +-
 llvm/test/YAMLParser/spec-09-02.data                   |  2 +-
 llvm/test/YAMLParser/spec-09-14.data                   |  2 +-
 llvm/test/YAMLParser/spec-09-21.data                   |  2 +-
 llvm/test/YAMLParser/spec-10-08.data                   |  2 +-
 215 files changed, 265 insertions(+), 265 deletions(-)

diff --git a/llvm/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll b/llvm/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll
index 4b787bf9d0c9..768411e9d35f 100644
--- a/llvm/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll
+++ b/llvm/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll
@@ -1,7 +1,7 @@
 ; This testcase consists of alias relations which should be completely
 ; resolvable by basicaa.
 
-; RUN: opt < %s -basicaa -aa-eval -print-may-aliases -disable-output |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-may-aliases -disable-output 2>&1 | FileCheck %s
 
 %T = type { i32, [10 x i8] }
 
diff --git a/llvm/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll b/llvm/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll
index 68039fbc0a7d..b7bbf7732f95 100644
--- a/llvm/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll
+++ b/llvm/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll
@@ -1,7 +1,7 @@
 ; This testcase consists of alias relations which should be completely
 ; resolvable by basicaa, but require analysis of getelementptr constant exprs.
 
-; RUN: opt < %s -basicaa -aa-eval -print-may-aliases -disable-output |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-may-aliases -disable-output 2>&1 | FileCheck %s
 
 %T = type { i32, [10 x i8] }
 
diff --git a/llvm/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll b/llvm/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll
index c98241e84692..06a804c392f8 100644
--- a/llvm/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll
+++ b/llvm/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -disable-output |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -disable-output 2>&1 | FileCheck %s
 ; TEST that A[1][0] may alias A[0][i].
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
diff --git a/llvm/test/Analysis/BasicAA/2007-08-01-NoAliasAndCalls.ll b/llvm/test/Analysis/BasicAA/2007-08-01-NoAliasAndCalls.ll
index b46ee1925ef7..2a6f5b9955d7 100644
--- a/llvm/test/Analysis/BasicAA/2007-08-01-NoAliasAndCalls.ll
+++ b/llvm/test/Analysis/BasicAA/2007-08-01-NoAliasAndCalls.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output 2>&1 | FileCheck %s
 
 ; CHECK: Function: foo
 ; CHECK:   MayAlias: i32* %x, i32* %y
diff --git a/llvm/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll b/llvm/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll
index 93b277edf671..4be793ec416a 100644
--- a/llvm/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll
+++ b/llvm/test/Analysis/BasicAA/2007-08-01-NoAliasAndGEP.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output 2>&1 | FileCheck %s
 
 ; CHECK: Function: foo
 ; CHECK:   MayAlias: i32* %Ipointer, i32* %Jpointer
diff --git a/llvm/test/Analysis/BasicAA/2008-11-23-NoaliasRet.ll b/llvm/test/Analysis/BasicAA/2008-11-23-NoaliasRet.ll
index e8cf380d6f5f..3db9a3fbcdc9 100644
--- a/llvm/test/Analysis/BasicAA/2008-11-23-NoaliasRet.ll
+++ b/llvm/test/Analysis/BasicAA/2008-11-23-NoaliasRet.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -disable-output |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -disable-output 2>&1 | FileCheck %s
 
 declare noalias i32* @_Znwj(i32 %x) nounwind
 
diff --git a/llvm/test/Analysis/BasicAA/2009-10-13-GEP-BaseNoAlias.ll b/llvm/test/Analysis/BasicAA/2009-10-13-GEP-BaseNoAlias.ll
index a9750d25c6e6..c546d68f425b 100644
--- a/llvm/test/Analysis/BasicAA/2009-10-13-GEP-BaseNoAlias.ll
+++ b/llvm/test/Analysis/BasicAA/2009-10-13-GEP-BaseNoAlias.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output 2>&1 | FileCheck %s
 ; If GEP base doesn't alias Z, then GEP doesn't alias Z.
 ; rdar://7282591
 
diff --git a/llvm/test/Analysis/BasicAA/2010-09-15-GEP-SignedArithmetic.ll b/llvm/test/Analysis/BasicAA/2010-09-15-GEP-SignedArithmetic.ll
index e647231de194..66569808fb66 100644
--- a/llvm/test/Analysis/BasicAA/2010-09-15-GEP-SignedArithmetic.ll
+++ b/llvm/test/Analysis/BasicAA/2010-09-15-GEP-SignedArithmetic.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output 2>&1 | FileCheck %s
 ; PR7959
 
 target datalayout = "e-p:32:32:32"
diff --git a/llvm/test/Analysis/BasicAA/args-rets-allocas-loads.ll b/llvm/test/Analysis/BasicAA/args-rets-allocas-loads.ll
index c7b43ec68474..066f46b16c01 100644
--- a/llvm/test/Analysis/BasicAA/args-rets-allocas-loads.ll
+++ b/llvm/test/Analysis/BasicAA/args-rets-allocas-loads.ll
@@ -1,4 +1,4 @@
-; RUN: opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output < %s |& FileCheck  %s
+; RUN: opt -basicaa -aa-eval -print-all-alias-modref-info -disable-output < %s 2>&1 | FileCheck  %s
 
 declare void @callee(double* %callee_arg)
 declare void @nocap_callee(double* nocapture %nocap_callee_arg)
diff --git a/llvm/test/Analysis/BasicAA/constant-over-index.ll b/llvm/test/Analysis/BasicAA/constant-over-index.ll
index 48ef2595f2c3..232533cc73e1 100644
--- a/llvm/test/Analysis/BasicAA/constant-over-index.ll
+++ b/llvm/test/Analysis/BasicAA/constant-over-index.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info 2>&1 | FileCheck %s
 ; PR4267
 
 ; CHECK: MayAlias: double* %p.0.i.0, double* %p3
diff --git a/llvm/test/Analysis/BasicAA/dag.ll b/llvm/test/Analysis/BasicAA/dag.ll
index 501f4c399b19..1d2f6f1a76dd 100644
--- a/llvm/test/Analysis/BasicAA/dag.ll
+++ b/llvm/test/Analysis/BasicAA/dag.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info 2>&1 | FileCheck %s
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 
diff --git a/llvm/test/Analysis/BasicAA/empty.ll b/llvm/test/Analysis/BasicAA/empty.ll
index 25927ebbe19e..dfc79f9c0420 100644
--- a/llvm/test/Analysis/BasicAA/empty.ll
+++ b/llvm/test/Analysis/BasicAA/empty.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output 2>&1 | FileCheck %s
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 
diff --git a/llvm/test/Analysis/BasicAA/gep-alias.ll b/llvm/test/Analysis/BasicAA/gep-alias.ll
index 4bb28326612c..9c2c7eeec38d 100644
--- a/llvm/test/Analysis/BasicAA/gep-alias.ll
+++ b/llvm/test/Analysis/BasicAA/gep-alias.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -gvn -instcombine -S |& FileCheck %s
+; RUN: opt < %s -basicaa -gvn -instcombine -S 2>&1 | FileCheck %s
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 
diff --git a/llvm/test/Analysis/BasicAA/getmodrefinfo-cs-cs.ll b/llvm/test/Analysis/BasicAA/getmodrefinfo-cs-cs.ll
index ebd349a6aa4f..f0f1a631d08d 100644
--- a/llvm/test/Analysis/BasicAA/getmodrefinfo-cs-cs.ll
+++ b/llvm/test/Analysis/BasicAA/getmodrefinfo-cs-cs.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output 2>&1 | FileCheck %s
 
 
 ; CHECK: Just Ref: call void @ro() <-> call void @f0()
diff --git a/llvm/test/Analysis/BasicAA/must-and-partial.ll b/llvm/test/Analysis/BasicAA/must-and-partial.ll
index 93b6184f4f4a..58139ff30eca 100644
--- a/llvm/test/Analysis/BasicAA/must-and-partial.ll
+++ b/llvm/test/Analysis/BasicAA/must-and-partial.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info 2>&1 | FileCheck %s
 
 ; When merging MustAlias and PartialAlias, merge to PartialAlias
 ; instead of MayAlias.
diff --git a/llvm/test/Analysis/BasicAA/phi-aa.ll b/llvm/test/Analysis/BasicAA/phi-aa.ll
index a1b8d2ce5335..6aa26c185e0f 100644
--- a/llvm/test/Analysis/BasicAA/phi-aa.ll
+++ b/llvm/test/Analysis/BasicAA/phi-aa.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output 2>&1 | FileCheck %s
 ; rdar://7282591
 
 @X = common global i32 0
diff --git a/llvm/test/Analysis/BasicAA/phi-and-select.ll b/llvm/test/Analysis/BasicAA/phi-and-select.ll
index f752ab3c3eca..b8fee00ed0d0 100644
--- a/llvm/test/Analysis/BasicAA/phi-and-select.ll
+++ b/llvm/test/Analysis/BasicAA/phi-and-select.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output |& FileCheck %s
+; RUN: opt < %s -basicaa -aa-eval -print-all-alias-modref-info -disable-output 2>&1 | FileCheck %s
 
 ; BasicAA should detect NoAliases in PHIs and Selects.
 
diff --git a/llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll b/llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
index 55d0be6f26fd..595cc427c452 100644
--- a/llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
+++ b/llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -print-callgraph -disable-output |& FileCheck %s
+; RUN: opt < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
 
 ; CHECK: Call graph node <<null function>>
 ; CHECK:  CS<{{.*}}> calls function 'callee'
diff --git a/llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll b/llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
index 632cd0c790a7..ac95188899c9 100644
--- a/llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
+++ b/llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -print-callgraph -disable-output |& FileCheck %s
+; RUN: opt < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
 
 @a = global void ()* @f		; <void ()**> [#uses=0]
 
diff --git a/llvm/test/Analysis/CallGraph/no-intrinsics.ll b/llvm/test/Analysis/CallGraph/no-intrinsics.ll
index 272a5593deef..450dce58e30f 100644
--- a/llvm/test/Analysis/CallGraph/no-intrinsics.ll
+++ b/llvm/test/Analysis/CallGraph/no-intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -print-callgraph -disable-output |& FileCheck %s
+; RUN: opt < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
 
 ; Check that intrinsics aren't added to the call graph
 
diff --git a/llvm/test/Analysis/RegionInfo/block_sort.ll b/llvm/test/Analysis/RegionInfo/block_sort.ll
index faec45a911f5..ac77ab36e6f5 100644
--- a/llvm/test/Analysis/RegionInfo/block_sort.ll
+++ b/llvm/test/Analysis/RegionInfo/block_sort.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats -analyze < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats -analyze < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @BZ2_blockSort() nounwind {
 start:
diff --git a/llvm/test/Analysis/RegionInfo/cond_loop.ll b/llvm/test/Analysis/RegionInfo/cond_loop.ll
index 2ce57c3c5f37..1145ffdba039 100644
--- a/llvm/test/Analysis/RegionInfo/cond_loop.ll
+++ b/llvm/test/Analysis/RegionInfo/cond_loop.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @normal_condition() nounwind {
 5:
diff --git a/llvm/test/Analysis/RegionInfo/condition_complicated.ll b/llvm/test/Analysis/RegionInfo/condition_complicated.ll
index 7ca5c7c7b537..6b398800db9c 100644
--- a/llvm/test/Analysis/RegionInfo/condition_complicated.ll
+++ b/llvm/test/Analysis/RegionInfo/condition_complicated.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define internal fastcc zeroext i8 @handle_compress() nounwind {
 end165:
diff --git a/llvm/test/Analysis/RegionInfo/condition_complicated_2.ll b/llvm/test/Analysis/RegionInfo/condition_complicated_2.ll
index 5fa940a61ef6..f551108d6083 100644
--- a/llvm/test/Analysis/RegionInfo/condition_complicated_2.ll
+++ b/llvm/test/Analysis/RegionInfo/condition_complicated_2.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define internal fastcc void @compress() nounwind {
 end33:
diff --git a/llvm/test/Analysis/RegionInfo/condition_forward_edge.ll b/llvm/test/Analysis/RegionInfo/condition_forward_edge.ll
index 098c9b6b4613..5e4d9d2f8b23 100644
--- a/llvm/test/Analysis/RegionInfo/condition_forward_edge.ll
+++ b/llvm/test/Analysis/RegionInfo/condition_forward_edge.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @normal_condition() nounwind {
 0:
diff --git a/llvm/test/Analysis/RegionInfo/condition_same_exit.ll b/llvm/test/Analysis/RegionInfo/condition_same_exit.ll
index 1b88596c0f8c..e48413a4c2dd 100644
--- a/llvm/test/Analysis/RegionInfo/condition_same_exit.ll
+++ b/llvm/test/Analysis/RegionInfo/condition_same_exit.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @normal_condition() nounwind {
 0:
diff --git a/llvm/test/Analysis/RegionInfo/condition_simple.ll b/llvm/test/Analysis/RegionInfo/condition_simple.ll
index 19b154b6476b..00d9ed24e17d 100644
--- a/llvm/test/Analysis/RegionInfo/condition_simple.ll
+++ b/llvm/test/Analysis/RegionInfo/condition_simple.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @normal_condition() nounwind {
 0:
diff --git a/llvm/test/Analysis/RegionInfo/exit_in_condition.ll b/llvm/test/Analysis/RegionInfo/exit_in_condition.ll
index 3b152d2f565d..b84abecc1649 100644
--- a/llvm/test/Analysis/RegionInfo/exit_in_condition.ll
+++ b/llvm/test/Analysis/RegionInfo/exit_in_condition.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define internal fastcc zeroext i8 @handle_compress() nounwind {
 entry:
diff --git a/llvm/test/Analysis/RegionInfo/infinite_loop.ll b/llvm/test/Analysis/RegionInfo/infinite_loop.ll
index 59cead492619..8e588286a58a 100644
--- a/llvm/test/Analysis/RegionInfo/infinite_loop.ll
+++ b/llvm/test/Analysis/RegionInfo/infinite_loop.ll
@@ -1,5 +1,5 @@
 ; RUN: opt -regions -analyze < %s 
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
 
 define void @normal_condition() nounwind {
 0:
diff --git a/llvm/test/Analysis/RegionInfo/infinite_loop_2.ll b/llvm/test/Analysis/RegionInfo/infinite_loop_2.ll
index 80c69b7ab2e2..a8227e340c5e 100644
--- a/llvm/test/Analysis/RegionInfo/infinite_loop_2.ll
+++ b/llvm/test/Analysis/RegionInfo/infinite_loop_2.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s 
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @normal_condition() nounwind {
 0:
diff --git a/llvm/test/Analysis/RegionInfo/infinite_loop_3.ll b/llvm/test/Analysis/RegionInfo/infinite_loop_3.ll
index 74ceafb84955..b09c9c1e5919 100644
--- a/llvm/test/Analysis/RegionInfo/infinite_loop_3.ll
+++ b/llvm/test/Analysis/RegionInfo/infinite_loop_3.ll
@@ -1,8 +1,8 @@
 ; RUN: opt -regions -analyze < %s 
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
 
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @normal_condition() nounwind {
 0:
diff --git a/llvm/test/Analysis/RegionInfo/infinite_loop_4.ll b/llvm/test/Analysis/RegionInfo/infinite_loop_4.ll
index fd56af1d3b8c..681c305ce971 100644
--- a/llvm/test/Analysis/RegionInfo/infinite_loop_4.ll
+++ b/llvm/test/Analysis/RegionInfo/infinite_loop_4.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s 
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @normal_condition() nounwind {
 0:
diff --git a/llvm/test/Analysis/RegionInfo/loop_with_condition.ll b/llvm/test/Analysis/RegionInfo/loop_with_condition.ll
index d1d68982eec6..08d2ba8e35a9 100644
--- a/llvm/test/Analysis/RegionInfo/loop_with_condition.ll
+++ b/llvm/test/Analysis/RegionInfo/loop_with_condition.ll
@@ -1,8 +1,8 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
 
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @normal_condition() nounwind {
 0:
diff --git a/llvm/test/Analysis/RegionInfo/loops_1.ll b/llvm/test/Analysis/RegionInfo/loops_1.ll
index d4bf3cc50118..6449949df843 100644
--- a/llvm/test/Analysis/RegionInfo/loops_1.ll
+++ b/llvm/test/Analysis/RegionInfo/loops_1.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define internal fastcc zeroext i8 @loops_1() nounwind {
 entry:
diff --git a/llvm/test/Analysis/RegionInfo/loops_2.ll b/llvm/test/Analysis/RegionInfo/loops_2.ll
index 07aa7c311010..dc4a1adffbac 100644
--- a/llvm/test/Analysis/RegionInfo/loops_2.ll
+++ b/llvm/test/Analysis/RegionInfo/loops_2.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @meread_() nounwind {
 entry:
diff --git a/llvm/test/Analysis/RegionInfo/mix_1.ll b/llvm/test/Analysis/RegionInfo/mix_1.ll
index 829c157c2c68..1474e033e574 100644
--- a/llvm/test/Analysis/RegionInfo/mix_1.ll
+++ b/llvm/test/Analysis/RegionInfo/mix_1.ll
@@ -1,8 +1,8 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
 
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @a_linear_impl_fig_1() nounwind {
 0:
diff --git a/llvm/test/Analysis/RegionInfo/multiple_exiting_edge.ll b/llvm/test/Analysis/RegionInfo/multiple_exiting_edge.ll
index 7bc0e4607d68..8de647229942 100644
--- a/llvm/test/Analysis/RegionInfo/multiple_exiting_edge.ll
+++ b/llvm/test/Analysis/RegionInfo/multiple_exiting_edge.ll
@@ -1,5 +1,5 @@
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @normal_condition_0() nounwind {
 bb38:                                             ; preds = %bb34, %bb34, %bb37
diff --git a/llvm/test/Analysis/RegionInfo/nested_loops.ll b/llvm/test/Analysis/RegionInfo/nested_loops.ll
index 9d8c4558f049..a3707a19872f 100644
--- a/llvm/test/Analysis/RegionInfo/nested_loops.ll
+++ b/llvm/test/Analysis/RegionInfo/nested_loops.ll
@@ -1,8 +1,8 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
 
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define internal fastcc zeroext i8 @handle_compress() nounwind {
 entry:
diff --git a/llvm/test/Analysis/RegionInfo/next.ll b/llvm/test/Analysis/RegionInfo/next.ll
index 377a84d389c1..890b4f23001e 100644
--- a/llvm/test/Analysis/RegionInfo/next.ll
+++ b/llvm/test/Analysis/RegionInfo/next.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @MAIN__() nounwind {
 entry:
diff --git a/llvm/test/Analysis/RegionInfo/paper.ll b/llvm/test/Analysis/RegionInfo/paper.ll
index 00b544bc6919..96c87e0559b4 100644
--- a/llvm/test/Analysis/RegionInfo/paper.ll
+++ b/llvm/test/Analysis/RegionInfo/paper.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define void @a_linear_impl_fig_1() nounwind {
 0:
diff --git a/llvm/test/Analysis/RegionInfo/two_loops_same_header.ll b/llvm/test/Analysis/RegionInfo/two_loops_same_header.ll
index a97182b81a24..e75661e8905b 100644
--- a/llvm/test/Analysis/RegionInfo/two_loops_same_header.ll
+++ b/llvm/test/Analysis/RegionInfo/two_loops_same_header.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -regions -analyze < %s | FileCheck %s
-; RUN: opt -regions -stats < %s |& FileCheck -check-prefix=STAT %s
-; RUN: opt -regions -print-region-style=bb  -analyze < %s |& FileCheck -check-prefix=BBIT %s
-; RUN: opt -regions -print-region-style=rn  -analyze < %s |& FileCheck -check-prefix=RNIT %s
+; RUN: opt -regions -stats < %s 2>&1 | FileCheck -check-prefix=STAT %s
+; RUN: opt -regions -print-region-style=bb  -analyze < %s 2>&1 | FileCheck -check-prefix=BBIT %s
+; RUN: opt -regions -print-region-style=rn  -analyze < %s 2>&1 | FileCheck -check-prefix=RNIT %s
 
 define internal fastcc zeroext i8 @handle_compress() nounwind {
 entry:
diff --git a/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect1.ll b/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect1.ll
index 9db9b71c7c79..5cf17a210140 100644
--- a/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect1.ll
+++ b/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect1.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -analyze -scalar-evolution |& not grep smax
+; RUN: opt < %s -analyze -scalar-evolution 2>&1 | not grep smax
 ; PR2261
 
 @lut = common global [256 x i8] zeroinitializer, align 32		; <[256 x i8]*> [#uses=1]
diff --git a/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect2.ll b/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect2.ll
index 18476655525f..195dfaaaee95 100644
--- a/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect2.ll
+++ b/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -analyze -scalar-evolution |& not grep smax
+; RUN: opt < %s -analyze -scalar-evolution 2>&1 | not grep smax
 ; PR2070
 
 define i32 @a(i32 %x) nounwind  {
diff --git a/llvm/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll b/llvm/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll
index 251f8830cee0..c25e4a3b2b23 100644
--- a/llvm/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll
+++ b/llvm/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -analyze -scalar-evolution |& \
+; RUN: opt < %s -analyze -scalar-evolution 2>&1 | \
 ; RUN: grep "Loop %bb: backedge-taken count is (7 + (-1 \* %argc))"
 
 define i32 @main(i32 %argc, i8** %argv) nounwind {
diff --git a/llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll b/llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll
index fa9f21af3713..db157ee56357 100644
--- a/llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll
+++ b/llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -analyze -scalar-evolution |& grep {/u 3}
+; RUN: opt < %s -analyze -scalar-evolution 2>&1 | grep {/u 3}
 ; XFAIL: *
 
 ; This is a tricky testcase for unsigned wrap detection which ScalarEvolution
diff --git a/llvm/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll b/llvm/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll
index 8152e988ffc6..de72c4c5ed92 100644
--- a/llvm/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll
+++ b/llvm/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -analyze -scalar-evolution |& \
+; RUN: opt < %s -analyze -scalar-evolution 2>&1 | \
 ; RUN: grep {(((-1 \\* %i0) + (100005 smax %i0)) /u 5)}
 ; XFAIL: *
 
diff --git a/llvm/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll b/llvm/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll
index 3eaa49212e71..36a37759fd5b 100644
--- a/llvm/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll
+++ b/llvm/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -analyze -scalar-evolution |& grep {/u 5}
+; RUN: opt < %s -analyze -scalar-evolution 2>&1 | grep {/u 5}
 ; XFAIL: *
 
 define i8 @foo0(i8 %i0) nounwind {
diff --git a/llvm/test/Analysis/ScalarEvolution/scev-aa.ll b/llvm/test/Analysis/ScalarEvolution/scev-aa.ll
index dd5a66ccb44c..a0abbb787b00 100644
--- a/llvm/test/Analysis/ScalarEvolution/scev-aa.ll
+++ b/llvm/test/Analysis/ScalarEvolution/scev-aa.ll
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -scev-aa -aa-eval -print-all-alias-modref-info \
-; RUN:   |& FileCheck %s
+; RUN:   2>&1 | FileCheck %s
 
 ; At the time of this writing, -basicaa misses the example of the form
 ; A[i+(j+1)] != A[i+j], which can arise from multi-dimensional array references,
diff --git a/llvm/test/Assembler/2003-11-24-SymbolTableCrash.ll b/llvm/test/Assembler/2003-11-24-SymbolTableCrash.ll
index e402d61aebfc..28fd30178d6a 100644
--- a/llvm/test/Assembler/2003-11-24-SymbolTableCrash.ll
+++ b/llvm/test/Assembler/2003-11-24-SymbolTableCrash.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "multiple definition"
+; RUN: not llvm-as < %s 2>&1 | grep "multiple definition"
 
 define void @test() {
 	%tmp.1 = add i32 0, 1
diff --git a/llvm/test/Assembler/2004-03-30-UnclosedFunctionCrash.ll b/llvm/test/Assembler/2004-03-30-UnclosedFunctionCrash.ll
index 22fa32ea0723..9f24f1afd55c 100644
--- a/llvm/test/Assembler/2004-03-30-UnclosedFunctionCrash.ll
+++ b/llvm/test/Assembler/2004-03-30-UnclosedFunctionCrash.ll
@@ -1,3 +1,3 @@
-; RUN: not llvm-as %s |& grep "found end of file when expecting more instructions"
+; RUN: not llvm-as %s 2>&1 | grep "found end of file when expecting more instructions"
 
 define void @foo() {
diff --git a/llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll b/llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll
index e57f7d43a159..4db5b7453b0f 100644
--- a/llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll
+++ b/llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll
@@ -1,4 +1,4 @@
 ; Test for PR463.  This program is erroneous, but should not crash llvm-as.
-; RUN: not llvm-as %s -o /dev/null |& grep "use of undefined type named 'struct.none'"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "use of undefined type named 'struct.none'"
 
 @.FOO  = internal global %struct.none zeroinitializer
diff --git a/llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll b/llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
index 9e08212e2937..184e543123f4 100644
--- a/llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
+++ b/llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
@@ -1,5 +1,5 @@
 ; The assembler should catch an undefined argument type .
-; RUN: not llvm-as %s -o /dev/null |& grep "use of undefined type named 'typedef.bc_struct'"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "use of undefined type named 'typedef.bc_struct'"
 
 ; %typedef.bc_struct = type opaque
 
diff --git a/llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll b/llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll
index 1653d68b8486..aa741443d831 100644
--- a/llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll
+++ b/llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll
@@ -1,5 +1,5 @@
 ; PR1117
-; RUN: not llvm-as %s -o /dev/null |& grep "invalid cast opcode for cast from"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "invalid cast opcode for cast from"
 
 define i8* @nada(i64 %X) {
     %result = trunc i64 %X to i8*
diff --git a/llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll b/llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll
index 64610505adff..479bef7d7a20 100644
--- a/llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll
+++ b/llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll
@@ -1,4 +1,4 @@
 ; PR1117
-; RUN: not llvm-as %s -o /dev/null |& grep "invalid cast opcode for cast from"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "invalid cast opcode for cast from"
 
 @X = constant i8* trunc (i64 0 to i8*)
diff --git a/llvm/test/Assembler/2008-02-18-IntPointerCrash.ll b/llvm/test/Assembler/2008-02-18-IntPointerCrash.ll
index a66fca70d841..4a33c36d5731 100644
--- a/llvm/test/Assembler/2008-02-18-IntPointerCrash.ll
+++ b/llvm/test/Assembler/2008-02-18-IntPointerCrash.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s |& grep "integer constant must have integer type"
+; RUN: not llvm-as %s 2>&1 | grep "integer constant must have integer type"
 ; PR2060
 
 define i8* @foo() {
diff --git a/llvm/test/Assembler/2008-09-02-FunctionNotes2.ll b/llvm/test/Assembler/2008-09-02-FunctionNotes2.ll
index 8a49e8990280..97351e2a5713 100644
--- a/llvm/test/Assembler/2008-09-02-FunctionNotes2.ll
+++ b/llvm/test/Assembler/2008-09-02-FunctionNotes2.ll
@@ -1,5 +1,5 @@
 ; Test function notes
-; RUN: not llvm-as %s -o /dev/null |& grep "Attributes noinline alwaysinline are incompatible"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "Attributes noinline alwaysinline are incompatible"
 define void @fn1() alwaysinline  noinline {
   ret void
 }
diff --git a/llvm/test/Assembler/extractvalue-invalid-idx.ll b/llvm/test/Assembler/extractvalue-invalid-idx.ll
index 9a215f719418..b5a398c2ccc5 100644
--- a/llvm/test/Assembler/extractvalue-invalid-idx.ll
+++ b/llvm/test/Assembler/extractvalue-invalid-idx.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& FileCheck %s
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
 ; PR4170
 
 ; CHECK: invalid indices for extractvalue
diff --git a/llvm/test/Assembler/insertvalue-invalid-idx.ll b/llvm/test/Assembler/insertvalue-invalid-idx.ll
index 355d4e8c10fd..74642f4eb0ce 100644
--- a/llvm/test/Assembler/insertvalue-invalid-idx.ll
+++ b/llvm/test/Assembler/insertvalue-invalid-idx.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& FileCheck %s
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
 
 ; CHECK: invalid indices for insertvalue
 
diff --git a/llvm/test/Assembler/invalid_cast.ll b/llvm/test/Assembler/invalid_cast.ll
index f68283572436..91e81c78ebf6 100644
--- a/llvm/test/Assembler/invalid_cast.ll
+++ b/llvm/test/Assembler/invalid_cast.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& FileCheck %s
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
 
 ; CHECK: invalid cast opcode for cast from '<4 x i64>' to '<3 x i8>'
 
diff --git a/llvm/test/Assembler/invalid_cast2.ll b/llvm/test/Assembler/invalid_cast2.ll
index a01b935629f5..5ce9546deb50 100644
--- a/llvm/test/Assembler/invalid_cast2.ll
+++ b/llvm/test/Assembler/invalid_cast2.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& FileCheck %s
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
 
 ; CHECK: invalid cast opcode for cast from '<4 x i64>' to 'i8'
 
diff --git a/llvm/test/CodeGen/ARM/2007-03-13-InstrSched.ll b/llvm/test/CodeGen/ARM/2007-03-13-InstrSched.ll
index 33f935e960b1..a63cdd46e2d8 100644
--- a/llvm/test/CodeGen/ARM/2007-03-13-InstrSched.ll
+++ b/llvm/test/CodeGen/ARM/2007-03-13-InstrSched.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -mtriple=arm-apple-darwin -relocation-model=pic \
 ; RUN:   -mattr=+v6 | grep r9
 ; RUN: llc < %s -mtriple=arm-apple-darwin -relocation-model=pic \
-; RUN:   -mattr=+v6 -arm-reserve-r9 -ifcvt-limit=0 -stats |& grep asm-printer
+; RUN:   -mattr=+v6 -arm-reserve-r9 -ifcvt-limit=0 -stats 2>&1 | grep asm-printer
 ; | grep 35
 
 define void @test(i32 %tmp56222, i32 %tmp36224, i32 %tmp46223, i32 %i.0196.0.ph, i32 %tmp8, i32* %tmp1011, i32** %tmp1, i32* %d2.1.out, i32* %d3.1.out, i32* %d0.1.out, i32* %d1.1.out) {
diff --git a/llvm/test/CodeGen/ARM/2011-12-14-machine-sink.ll b/llvm/test/CodeGen/ARM/2011-12-14-machine-sink.ll
index 5ce600d1a939..b21bb006e327 100644
--- a/llvm/test/CodeGen/ARM/2011-12-14-machine-sink.ll
+++ b/llvm/test/CodeGen/ARM/2011-12-14-machine-sink.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -o /dev/null -stats |& FileCheck %s -check-prefix=STATS
+; RUN: llc < %s -o /dev/null -stats 2>&1 | FileCheck %s -check-prefix=STATS
 ; Radar 10266272
 target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:32:64-v128:32:128-a0:0:32-n32-S32"
 target triple = "thumbv7-apple-ios4.0.0"
diff --git a/llvm/test/CodeGen/ARM/addrmode.ll b/llvm/test/CodeGen/ARM/addrmode.ll
index 9ccff07d456b..6da90897b94b 100644
--- a/llvm/test/CodeGen/ARM/addrmode.ll
+++ b/llvm/test/CodeGen/ARM/addrmode.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=arm -stats |& grep asm-printer | grep 4
+; RUN: llc < %s -march=arm -stats 2>&1 | grep asm-printer | grep 4
 
 define i32 @t1(i32 %a) {
 	%b = mul i32 %a, 9
diff --git a/llvm/test/CodeGen/Generic/print-after.ll b/llvm/test/CodeGen/Generic/print-after.ll
index 0c4695dce568..7505907ef773 100644
--- a/llvm/test/CodeGen/Generic/print-after.ll
+++ b/llvm/test/CodeGen/Generic/print-after.ll
@@ -1,4 +1,4 @@
-; RUN: not llc --help-hidden |& FileCheck %s
+; RUN: not llc --help-hidden 2>&1 | FileCheck %s
 
 ; CHECK: -print-after
 ; CHECK-NOT: -print-after-all
diff --git a/llvm/test/CodeGen/Generic/print-machineinstrs.ll b/llvm/test/CodeGen/Generic/print-machineinstrs.ll
index 75b4cd14fff2..75dceb5b2623 100644
--- a/llvm/test/CodeGen/Generic/print-machineinstrs.ll
+++ b/llvm/test/CodeGen/Generic/print-machineinstrs.ll
@@ -1,6 +1,6 @@
-; RUN: llc < %s -O3 -debug-pass=Structure -print-machineinstrs=branch-folder -o /dev/null |& FileCheck %s
-; RUN: llc < %s -O3 -debug-pass=Structure -print-machineinstrs -o /dev/null |& FileCheck %s
-; RUN: llc < %s -O3 -debug-pass=Structure -print-machineinstrs= -o /dev/null |& FileCheck %s
+; RUN: llc < %s -O3 -debug-pass=Structure -print-machineinstrs=branch-folder -o /dev/null 2>&1 | FileCheck %s
+; RUN: llc < %s -O3 -debug-pass=Structure -print-machineinstrs -o /dev/null 2>&1 | FileCheck %s
+; RUN: llc < %s -O3 -debug-pass=Structure -print-machineinstrs= -o /dev/null 2>&1 | FileCheck %s
 
 define i64 @foo(i64 %a, i64 %b) nounwind {
 ; CHECK: -branch-folder -print-machineinstrs
diff --git a/llvm/test/CodeGen/PowerPC/iabs.ll b/llvm/test/CodeGen/PowerPC/iabs.ll
index 595e3556531e..7d089bbd653c 100644
--- a/llvm/test/CodeGen/PowerPC/iabs.ll
+++ b/llvm/test/CodeGen/PowerPC/iabs.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc32 -stats |& \
+; RUN: llc < %s -march=ppc32 -stats 2>&1 | \
 ; RUN:   grep "4 .*Number of machine instrs printed"
 
 ;; Integer absolute value, should produce something as good as:
diff --git a/llvm/test/CodeGen/PowerPC/lsr-postinc-pos.ll b/llvm/test/CodeGen/PowerPC/lsr-postinc-pos.ll
index f441e42da2f1..42472c58fe8b 100644
--- a/llvm/test/CodeGen/PowerPC/lsr-postinc-pos.ll
+++ b/llvm/test/CodeGen/PowerPC/lsr-postinc-pos.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -print-lsr-output |& FileCheck %s
+; RUN: llc < %s -print-lsr-output 2>&1 | FileCheck %s
 
 ; The icmp is a post-inc use, and the increment is in %bb11, but the
 ; scevgep needs to be inserted in %bb so that it is dominated by %t.
diff --git a/llvm/test/CodeGen/PowerPC/rlwimi3.ll b/llvm/test/CodeGen/PowerPC/rlwimi3.ll
index afeba49de943..7efdbe9634fe 100644
--- a/llvm/test/CodeGen/PowerPC/rlwimi3.ll
+++ b/llvm/test/CodeGen/PowerPC/rlwimi3.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc32 -stats |& \
+; RUN: llc < %s -march=ppc32 -stats 2>&1 | \
 ; RUN:   grep "Number of machine instrs printed" | grep 12
 
 define i16 @Trans16Bit(i32 %srcA, i32 %srcB, i32 %alpha) {
diff --git a/llvm/test/CodeGen/Thumb/iabs.ll b/llvm/test/CodeGen/Thumb/iabs.ll
index d27db0d6f252..2e77660c45c1 100644
--- a/llvm/test/CodeGen/Thumb/iabs.ll
+++ b/llvm/test/CodeGen/Thumb/iabs.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=thumb -stats |& \
+; RUN: llc < %s -march=thumb -stats 2>&1 | \
 ; RUN:   grep "4 .*Number of machine instrs printed"
 
 ;; Integer absolute value, should produce something as good as:
diff --git a/llvm/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.ll b/llvm/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.ll
index 24848602baf8..0af2445d7fba 100644
--- a/llvm/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.ll
+++ b/llvm/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.ll
@@ -3,7 +3,7 @@
 ; it makes a ton of annoying overlapping live ranges.  This code should not
 ; cause spills!
 ;
-; RUN: llc < %s -march=x86 -stats |& not grep spilled
+; RUN: llc < %s -march=x86 -stats 2>&1 | not grep spilled
 
 target datalayout = "e-p:32:32"
 
diff --git a/llvm/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll b/llvm/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll
index 0421896922b9..1a3d74918d1a 100644
--- a/llvm/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll
+++ b/llvm/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86  -stats |& \
+; RUN: llc < %s -march=x86  -stats 2>&1 | \
 ; RUN:   grep asm-printer | grep 7
 
 define i32 @g(i32 %a, i32 %b) nounwind {
diff --git a/llvm/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll b/llvm/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll
index b0453299669e..bbc39eeb8be6 100644
--- a/llvm/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll
+++ b/llvm/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mcpu=yonah -stats |& \
+; RUN: llc < %s -march=x86 -mcpu=yonah -stats 2>&1 | \
 ; RUN:   not grep {Number of register spills}
 ; END.
 
diff --git a/llvm/test/CodeGen/X86/2006-05-02-InstrSched1.ll b/llvm/test/CodeGen/X86/2006-05-02-InstrSched1.ll
index 7d0a6ab0a04c..1c75f93915a7 100644
--- a/llvm/test/CodeGen/X86/2006-05-02-InstrSched1.ll
+++ b/llvm/test/CodeGen/X86/2006-05-02-InstrSched1.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -relocation-model=static -stats |& \
+; RUN: llc < %s -march=x86 -relocation-model=static -stats 2>&1 | \
 ; RUN:   grep asm-printer | grep 14
 ;
 @size20 = external global i32		; <i32*> [#uses=1]
diff --git a/llvm/test/CodeGen/X86/2006-05-02-InstrSched2.ll b/llvm/test/CodeGen/X86/2006-05-02-InstrSched2.ll
index 23954d76a5d6..95eefa1e7196 100644
--- a/llvm/test/CodeGen/X86/2006-05-02-InstrSched2.ll
+++ b/llvm/test/CodeGen/X86/2006-05-02-InstrSched2.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -stats  |& \
+; RUN: llc < %s -march=x86 -stats  2>&1 | \
 ; RUN:   grep asm-printer | grep 13
 
 define void @_ZN9__gnu_cxx9hashtableISt4pairIKPKciES3_NS_4hashIS3_EESt10_Select1stIS5_E5eqstrSaIiEE14find_or_insertERKS5__cond_true456.i(i8* %tmp435.i, i32* %tmp449.i.out) nounwind {
diff --git a/llvm/test/CodeGen/X86/2006-05-11-InstrSched.ll b/llvm/test/CodeGen/X86/2006-05-11-InstrSched.ll
index 77228c5d1519..37c510786a5e 100644
--- a/llvm/test/CodeGen/X86/2006-05-11-InstrSched.ll
+++ b/llvm/test/CodeGen/X86/2006-05-11-InstrSched.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mtriple=i386-linux-gnu -mcpu=penryn -mattr=+sse2 -stats -realign-stack=0 |&\
+; RUN: llc < %s -march=x86 -mtriple=i386-linux-gnu -mcpu=penryn -mattr=+sse2 -stats -realign-stack=0 2>&1 | \
 ; RUN:     grep "asm-printer" | grep 35
 
 target datalayout = "e-p:32:32"
diff --git a/llvm/test/CodeGen/X86/2008-02-18-TailMergingBug.ll b/llvm/test/CodeGen/X86/2008-02-18-TailMergingBug.ll
index 9ff815a80c5b..a1b973d7ccfa 100644
--- a/llvm/test/CodeGen/X86/2008-02-18-TailMergingBug.ll
+++ b/llvm/test/CodeGen/X86/2008-02-18-TailMergingBug.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mcpu=yonah -stats |& grep "Number of block tails merged" | grep 16
+; RUN: llc < %s -march=x86 -mcpu=yonah -stats 2>&1 | grep "Number of block tails merged" | grep 16
 ; PR1909
 
 @.str = internal constant [48 x i8] c"transformed bounds: (%.2f, %.2f), (%.2f, %.2f)\0A\00"		; <[48 x i8]*> [#uses=1]
diff --git a/llvm/test/CodeGen/X86/2008-10-27-CoalescerBug.ll b/llvm/test/CodeGen/X86/2008-10-27-CoalescerBug.ll
index 9d144a4be0e9..66f06778bdec 100644
--- a/llvm/test/CodeGen/X86/2008-10-27-CoalescerBug.ll
+++ b/llvm/test/CodeGen/X86/2008-10-27-CoalescerBug.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -mtriple=i386-apple-darwin -mattr=+sse2 -stats |& FileCheck %s
+; RUN: llc < %s -mtriple=i386-apple-darwin -mattr=+sse2 -stats 2>&1 | FileCheck %s
 ; Now this test spills one register. But a reload in the loop is cheaper than
 ; the divsd so it's a win.
 
diff --git a/llvm/test/CodeGen/X86/2009-02-25-CommuteBug.ll b/llvm/test/CodeGen/X86/2009-02-25-CommuteBug.ll
index 7ea699833ba8..9cbf35094061 100644
--- a/llvm/test/CodeGen/X86/2009-02-25-CommuteBug.ll
+++ b/llvm/test/CodeGen/X86/2009-02-25-CommuteBug.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mattr=+sse2 -stats |& not grep commuted
+; RUN: llc < %s -march=x86 -mattr=+sse2 -stats 2>&1 | not grep commuted
 ; rdar://6608609
 
 define <2 x double> @t(<2 x double> %A, <2 x double> %B, <2 x double> %C) nounwind readnone {
diff --git a/llvm/test/CodeGen/X86/2009-02-26-MachineLICMBug.ll b/llvm/test/CodeGen/X86/2009-02-26-MachineLICMBug.ll
index a6e9b8f11f79..1b2f20303ba9 100644
--- a/llvm/test/CodeGen/X86/2009-02-26-MachineLICMBug.ll
+++ b/llvm/test/CodeGen/X86/2009-02-26-MachineLICMBug.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86-64 -mattr=+sse3,+sse41 -mcpu=penryn -stats |& grep "8 machine-licm"
+; RUN: llc < %s -march=x86-64 -mattr=+sse3,+sse41 -mcpu=penryn -stats 2>&1 | grep "8 machine-licm"
 ; RUN: llc < %s -march=x86-64 -mattr=+sse3,+sse41 -mcpu=penryn | FileCheck %s
 ; rdar://6627786
 ; rdar://7792037
diff --git a/llvm/test/CodeGen/X86/2009-04-16-SpillerUnfold.ll b/llvm/test/CodeGen/X86/2009-04-16-SpillerUnfold.ll
index f46eed4769f7..56eba9eb4689 100644
--- a/llvm/test/CodeGen/X86/2009-04-16-SpillerUnfold.ll
+++ b/llvm/test/CodeGen/X86/2009-04-16-SpillerUnfold.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -mtriple=x86_64-apple-darwin10.0 -relocation-model=pic -disable-fp-elim -stats |& grep {Number of modref unfolded}
+; RUN: llc < %s -mtriple=x86_64-apple-darwin10.0 -relocation-model=pic -disable-fp-elim -stats 2>&1 | grep {Number of modref unfolded}
 ; XFAIL: *
 ; 69408 removed the opportunity for this optimization to work
 
diff --git a/llvm/test/CodeGen/X86/2010-01-19-OptExtBug.ll b/llvm/test/CodeGen/X86/2010-01-19-OptExtBug.ll
index cd8960b9ed7b..eb4a5c04a2ae 100644
--- a/llvm/test/CodeGen/X86/2010-01-19-OptExtBug.ll
+++ b/llvm/test/CodeGen/X86/2010-01-19-OptExtBug.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -mtriple=x86_64-apple-darwin11 -relocation-model=pic -disable-fp-elim -stats |& not grep ext-opt
+; RUN: llc < %s -mtriple=x86_64-apple-darwin11 -relocation-model=pic -disable-fp-elim -stats 2>&1 | not grep ext-opt
 
 define fastcc i8* @S_scan_str(i8* %start, i32 %keep_quoted, i32 %keep_delims) nounwind ssp {
 entry:
diff --git a/llvm/test/CodeGen/X86/2011-06-12-FastAllocSpill.ll b/llvm/test/CodeGen/X86/2011-06-12-FastAllocSpill.ll
index a51dad03039e..47ef693cc25e 100644
--- a/llvm/test/CodeGen/X86/2011-06-12-FastAllocSpill.ll
+++ b/llvm/test/CodeGen/X86/2011-06-12-FastAllocSpill.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -O0 -disable-fp-elim -relocation-model=pic -stats |& FileCheck %s
+; RUN: llc < %s -O0 -disable-fp-elim -relocation-model=pic -stats 2>&1 | FileCheck %s
 ;
 ; This test should not cause any spilling with RAFast.
 ;
diff --git a/llvm/test/CodeGen/X86/2012-03-26-PostRALICMBug.ll b/llvm/test/CodeGen/X86/2012-03-26-PostRALICMBug.ll
index 101eccabbd49..d580b4f36db2 100644
--- a/llvm/test/CodeGen/X86/2012-03-26-PostRALICMBug.ll
+++ b/llvm/test/CodeGen/X86/2012-03-26-PostRALICMBug.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -mtriple=x86_64-apple-darwin10 -stats |& \
+; RUN: llc < %s -mtriple=x86_64-apple-darwin10 -stats 2>&1 | \
 ; RUN:   not grep {Number of machine instructions hoisted out of loops post regalloc}
 
 ; rdar://11095580
diff --git a/llvm/test/CodeGen/X86/MachineSink-PHIUse.ll b/llvm/test/CodeGen/X86/MachineSink-PHIUse.ll
index 6193865ce18e..33141680aa92 100644
--- a/llvm/test/CodeGen/X86/MachineSink-PHIUse.ll
+++ b/llvm/test/CodeGen/X86/MachineSink-PHIUse.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -mtriple=x86_64-appel-darwin -disable-cgp-branch-opts -stats |& grep "machine-sink"
+; RUN: llc < %s -mtriple=x86_64-appel-darwin -disable-cgp-branch-opts -stats 2>&1 | grep "machine-sink"
 
 define fastcc void @t() nounwind ssp {
 entry:
diff --git a/llvm/test/CodeGen/X86/convert-2-addr-3-addr-inc64.ll b/llvm/test/CodeGen/X86/convert-2-addr-3-addr-inc64.ll
index b82348b32e43..064ee364d14e 100644
--- a/llvm/test/CodeGen/X86/convert-2-addr-3-addr-inc64.ll
+++ b/llvm/test/CodeGen/X86/convert-2-addr-3-addr-inc64.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -mtriple=x86_64-linux -o /dev/null -stats |& FileCheck %s -check-prefix=STATS
-; RUN: llc < %s -mtriple=x86_64-win32 -o /dev/null -stats |& FileCheck %s -check-prefix=STATS
+; RUN: llc < %s -mtriple=x86_64-linux -o /dev/null -stats 2>&1 | FileCheck %s -check-prefix=STATS
+; RUN: llc < %s -mtriple=x86_64-win32 -o /dev/null -stats 2>&1 | FileCheck %s -check-prefix=STATS
 ; STATS: 9 asm-printer
 
 ; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s
diff --git a/llvm/test/CodeGen/X86/dagcombine-cse.ll b/llvm/test/CodeGen/X86/dagcombine-cse.ll
index c3c7990d19eb..af69531246cf 100644
--- a/llvm/test/CodeGen/X86/dagcombine-cse.ll
+++ b/llvm/test/CodeGen/X86/dagcombine-cse.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mattr=+sse2 -mtriple=i386-apple-darwin -stats |& grep asm-printer | grep 14
+; RUN: llc < %s -march=x86 -mattr=+sse2 -mtriple=i386-apple-darwin -stats 2>&1 | grep asm-printer | grep 14
 
 define i32 @t(i8* %ref_frame_ptr, i32 %ref_frame_stride, i32 %idxX, i32 %idxY) nounwind  {
 entry:
diff --git a/llvm/test/CodeGen/X86/hoist-invariant-load.ll b/llvm/test/CodeGen/X86/hoist-invariant-load.ll
index 4289fa7cc254..74ecd045b3d5 100644
--- a/llvm/test/CodeGen/X86/hoist-invariant-load.ll
+++ b/llvm/test/CodeGen/X86/hoist-invariant-load.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -stats -O2 |& grep "1 machine-licm"
+; RUN: llc < %s -stats -O2 2>&1 | grep "1 machine-licm"
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.7.2"
diff --git a/llvm/test/CodeGen/X86/label-redefinition.ll b/llvm/test/CodeGen/X86/label-redefinition.ll
index dece27b84300..9e88a18e8732 100644
--- a/llvm/test/CodeGen/X86/label-redefinition.ll
+++ b/llvm/test/CodeGen/X86/label-redefinition.ll
@@ -1,5 +1,5 @@
 ; PR7054
-; RUN: not llc %s -o - |& grep "'_foo' label emitted multiple times to assembly"
+; RUN: not llc %s -o - 2>&1 | grep "'_foo' label emitted multiple times to assembly"
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-n8:16:32"
 target triple = "i386-apple-darwin10.0.0"
 
diff --git a/llvm/test/CodeGen/X86/phi-immediate-factoring.ll b/llvm/test/CodeGen/X86/phi-immediate-factoring.ll
index d53108485d55..476bb1099831 100644
--- a/llvm/test/CodeGen/X86/phi-immediate-factoring.ll
+++ b/llvm/test/CodeGen/X86/phi-immediate-factoring.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -stats |& grep "Number of blocks eliminated" | grep 6
+; RUN: llc < %s -march=x86 -stats 2>&1 | grep "Number of blocks eliminated" | grep 6
 ; PR1296
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
diff --git a/llvm/test/CodeGen/X86/pr3522.ll b/llvm/test/CodeGen/X86/pr3522.ll
index 112253038b79..42db26455a93 100644
--- a/llvm/test/CodeGen/X86/pr3522.ll
+++ b/llvm/test/CodeGen/X86/pr3522.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -stats |& not grep {instructions sunk}
+; RUN: llc < %s -march=x86 -stats 2>&1 | not grep {instructions sunk}
 ; PR3522
 
 target triple = "i386-pc-linux-gnu"
diff --git a/llvm/test/CodeGen/X86/regpressure.ll b/llvm/test/CodeGen/X86/regpressure.ll
index e0b5f7a870bb..4eaf00421ad1 100644
--- a/llvm/test/CodeGen/X86/regpressure.ll
+++ b/llvm/test/CodeGen/X86/regpressure.ll
@@ -1,7 +1,7 @@
 ;; Both functions in this testcase should codegen to the same function, and
 ;; neither of them should require spilling anything to the stack.
 
-; RUN: llc < %s -march=x86 -stats |& \
+; RUN: llc < %s -march=x86 -stats 2>&1 | \
 ; RUN:   not grep {Number of register spills}
 
 ;; This can be compiled to use three registers if the loads are not
diff --git a/llvm/test/CodeGen/X86/sse_reload_fold.ll b/llvm/test/CodeGen/X86/sse_reload_fold.ll
index a57fa588f054..fd8db3be1063 100644
--- a/llvm/test/CodeGen/X86/sse_reload_fold.ll
+++ b/llvm/test/CodeGen/X86/sse_reload_fold.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -mtriple=x86_64-linux -mattr=+64bit,+sse3 -print-failed-fuse-candidates -regalloc=basic |& FileCheck %s
+; RUN: llc < %s -mtriple=x86_64-linux -mattr=+64bit,+sse3 -print-failed-fuse-candidates -regalloc=basic 2>&1 | FileCheck %s
 ; CHECK: fail
 ; CHECK-NOT: fail
 
diff --git a/llvm/test/CodeGen/X86/twoaddr-coalesce-2.ll b/llvm/test/CodeGen/X86/twoaddr-coalesce-2.ll
index e50e7c52d18e..af6d47af7a0f 100644
--- a/llvm/test/CodeGen/X86/twoaddr-coalesce-2.ll
+++ b/llvm/test/CodeGen/X86/twoaddr-coalesce-2.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mattr=+sse2 -mcpu=penryn -stats |& \
+; RUN: llc < %s -march=x86 -mattr=+sse2 -mcpu=penryn -stats 2>&1 | \
 ; RUN:   grep "twoaddrinstr" | grep "Number of instructions aggressively commuted"
 ; rdar://6480363
 
diff --git a/llvm/test/CodeGen/X86/twoaddr-pass-sink.ll b/llvm/test/CodeGen/X86/twoaddr-pass-sink.ll
index f4ac09ab1d73..513c304e3bf8 100644
--- a/llvm/test/CodeGen/X86/twoaddr-pass-sink.ll
+++ b/llvm/test/CodeGen/X86/twoaddr-pass-sink.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mattr=+sse2 -stats |& grep "Number of 3-address instructions sunk"
+; RUN: llc < %s -march=x86 -mattr=+sse2 -stats 2>&1 | grep "Number of 3-address instructions sunk"
 
 define void @t2(<2 x i64>* %vDct, <2 x i64>* %vYp, i8* %skiplist, <2 x i64> %a1) nounwind  {
 entry:
diff --git a/llvm/test/DebugInfo/printdbginfo2.ll b/llvm/test/DebugInfo/printdbginfo2.ll
index 319379197477..396ae852266a 100644
--- a/llvm/test/DebugInfo/printdbginfo2.ll
+++ b/llvm/test/DebugInfo/printdbginfo2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -print-dbginfo -disable-output |& FileCheck %s
+; RUN: opt < %s -print-dbginfo -disable-output 2>&1 | FileCheck %s
 ;  grep {%b is variable b of type x declared at x.c:7} %t1
 ;  grep {%2 is variable b of type x declared at x.c:7} %t1
 ;  grep {@c.1442 is variable c of type int declared at x.c:4} %t1
diff --git a/llvm/test/Feature/globalredefinition3.ll b/llvm/test/Feature/globalredefinition3.ll
index 3a159725a06e..2551d932d8a6 100644
--- a/llvm/test/Feature/globalredefinition3.ll
+++ b/llvm/test/Feature/globalredefinition3.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s -o /dev/null |& grep "redefinition of global '@B'"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "redefinition of global '@B'"
 
 @B = global i32 7
 @B = global i32 7
diff --git a/llvm/test/Feature/load_module.ll b/llvm/test/Feature/load_module.ll
index 05f6c238134f..14c1153fa569 100644
--- a/llvm/test/Feature/load_module.ll
+++ b/llvm/test/Feature/load_module.ll
@@ -1,6 +1,6 @@
 ; PR1318
 ; RUN: opt < %s -load=%llvmshlibdir/LLVMHello%shlibext -hello \
-; RUN:   -disable-output |& grep Hello
+; RUN:   -disable-output 2>&1 | grep Hello
 ; REQUIRES: loadable_module
 ; FIXME: On Cygming, it might fail without building LLVMHello manually.
 
diff --git a/llvm/test/Linker/2003-08-24-InheritPtrSize.ll b/llvm/test/Linker/2003-08-24-InheritPtrSize.ll
index 487172f88f03..51d544b83f90 100644
--- a/llvm/test/Linker/2003-08-24-InheritPtrSize.ll
+++ b/llvm/test/Linker/2003-08-24-InheritPtrSize.ll
@@ -3,7 +3,7 @@
 
 ; RUN: llvm-as < %s > %t.out1.bc
 ; RUN: echo "" | llvm-as > %t.out2.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc |& not grep warning
+; RUN: llvm-link %t.out1.bc %t.out2.bc 2>&1 | not grep warning
 
 target datalayout = "e-p:64:64"
 
diff --git a/llvm/test/Linker/link-messages.ll b/llvm/test/Linker/link-messages.ll
index 1faae186ddd5..4e7ffbc97d64 100644
--- a/llvm/test/Linker/link-messages.ll
+++ b/llvm/test/Linker/link-messages.ll
@@ -2,7 +2,7 @@
 ; that error is printed out.
 ; RUN: llvm-as %s -o %t.one.bc
 ; RUN: llvm-as %s -o %t.two.bc
-; RUN: not llvm-link %t.one.bc %t.two.bc -o %t.bc |& FileCheck %s
+; RUN: not llvm-link %t.one.bc %t.two.bc -o %t.bc 2>&1 | FileCheck %s
 
 ; CHECK: symbol multiply defined
 define i32 @bar() {
diff --git a/llvm/test/Linker/module-flags-4-a.ll b/llvm/test/Linker/module-flags-4-a.ll
index f411a569d830..a656c8b84b9f 100644
--- a/llvm/test/Linker/module-flags-4-a.ll
+++ b/llvm/test/Linker/module-flags-4-a.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-link %s %p/module-flags-4-b.ll -S -o - |& FileCheck %s
+; RUN: not llvm-link %s %p/module-flags-4-b.ll -S -o - 2>&1 | FileCheck %s
 
 ; Test 'require' error.
 
diff --git a/llvm/test/Linker/module-flags-5-a.ll b/llvm/test/Linker/module-flags-5-a.ll
index 2e59ecca702c..8d625cd8c9de 100644
--- a/llvm/test/Linker/module-flags-5-a.ll
+++ b/llvm/test/Linker/module-flags-5-a.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-link %s %p/module-flags-5-b.ll -S -o - |& FileCheck %s
+; RUN: not llvm-link %s %p/module-flags-5-b.ll -S -o - 2>&1 | FileCheck %s
 
 ; Test the 'override' error.
 
diff --git a/llvm/test/Linker/module-flags-6-a.ll b/llvm/test/Linker/module-flags-6-a.ll
index c3e0225814f5..5329c436a473 100644
--- a/llvm/test/Linker/module-flags-6-a.ll
+++ b/llvm/test/Linker/module-flags-6-a.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-link %s %p/module-flags-6-b.ll -S -o - |& FileCheck %s
+; RUN: not llvm-link %s %p/module-flags-6-b.ll -S -o - 2>&1 | FileCheck %s
 
 ; Test module flags error messages.
 
diff --git a/llvm/test/Linker/redefinition.ll b/llvm/test/Linker/redefinition.ll
index ec7e0a3002c3..23ba6a100f06 100644
--- a/llvm/test/Linker/redefinition.ll
+++ b/llvm/test/Linker/redefinition.ll
@@ -3,8 +3,8 @@
 ; RUN: llvm-as %s -o %t.foo1.bc
 ; RUN: llvm-as %s -o %t.foo2.bc
 ; RUN: echo "define void @foo(i32 %x) { ret void }" | llvm-as -o %t.foo3.bc
-; RUN: not llvm-link %t.foo1.bc %t.foo2.bc -o %t.bc |& \
+; RUN: not llvm-link %t.foo1.bc %t.foo2.bc -o %t.bc 2>&1 | \
 ; RUN:   grep "symbol multiply defined"
-; RUN: not llvm-link %t.foo1.bc %t.foo3.bc -o %t.bc |& \
+; RUN: not llvm-link %t.foo1.bc %t.foo3.bc -o %t.bc 2>&1 | \
 ; RUN:   grep "symbol multiply defined"
 define void @foo() { ret void }
diff --git a/llvm/test/MC/AsmParser/purgem.s b/llvm/test/MC/AsmParser/purgem.s
index 46004eeda381..c76c1c6d27db 100644
--- a/llvm/test/MC/AsmParser/purgem.s
+++ b/llvm/test/MC/AsmParser/purgem.s
@@ -1,4 +1,4 @@
-# RUN: not llvm-mc -triple i386-unknown-unknown %s |& FileCheck %s
+# RUN: not llvm-mc -triple i386-unknown-unknown %s 2>&1 | FileCheck %s
 
 .macro foo
 .err
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-BFI-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-BFI-arm.txt
index 3743ac8208e7..f7acce9fc015 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-BFI-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-BFI-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=60 Name=BFI Format=ARM_FORMAT_DPFRM(4)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-Bcc-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-Bcc-thumb.txt
index 902554241306..356c376fedea 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-Bcc-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-Bcc-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=2249 Name=tBcc Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-CPS2p-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-CPS2p-arm.txt
index c6265f84b733..bc8b7e10b91d 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-CPS2p-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-CPS2p-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # invalid imod value (0b01)
 0xc0 0x67 0x4 0xf1
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-CPS3p-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-CPS3p-arm.txt
index b23653e0495b..842a52b72928 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-CPS3p-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-CPS3p-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "potentially undefined instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "potentially undefined instruction encoding"
 
 # invalid (imod, M, iflags) combination
 0x93 0x00 0x02 0xf1
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-DMB-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-DMB-thumb.txt
index c78e7c9562c9..83961569bd1a 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-DMB-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-DMB-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=1908 Name=t2DMB Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-DSB-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-DSB-arm.txt
index afe467f515e6..2c6e6a7fa265 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-DSB-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-DSB-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=102 Name=DSB Format=ARM_FORMAT_MISCFRM(26)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-IT-CBNZ-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-IT-CBNZ-thumb.txt
index 3d70c9404da4..4297c016e86b 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-IT-CBNZ-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-IT-CBNZ-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep "potentially undefined instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 2>&1 | grep "potentially undefined instruction encoding"
 
 # CBZ / CBNZ not allowed in IT block.
 
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-IT-CC15.txt b/llvm/test/MC/Disassembler/ARM/invalid-IT-CC15.txt
index 17e25ead42f1..733895d6af6b 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-IT-CC15.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-IT-CC15.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-unknown-unknown |& grep und
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-unknown-unknown 2>&1 | grep und
 # rdar://10841671
 
 0xe3 0xbf
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-IT-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-IT-thumb.txt
index 6b10e6759866..1a8ff48cd99d 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-IT-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-IT-thumb.txt
@@ -1,3 +1,3 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-unknown-unknown |& grep "potentially undefined instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-unknown-unknown 2>&1 | grep "potentially undefined instruction encoding"
 
 0xff 0xbf 0x6b 0x80 0x00 0x75
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-LDC-form-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-LDC-form-arm.txt
index 41f734daae95..6cff09e71960 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-LDC-form-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-LDC-form-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=0 Name=PHI Format=(42)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-LDM-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-LDM-thumb.txt
index d6e746cdc197..7d8c492649ac 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-LDM-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-LDM-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep "potentially undefined instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 2>&1 | grep "potentially undefined instruction encoding"
 
 # Writeback is not allowed is Rn is in the target register list.
 
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt
index 1dad49d7e560..68d22debb0e8 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "potentially undefined instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "potentially undefined instruction encoding"
 
 # Opcode=140 Name=LDRB_POST Format=ARM_FORMAT_LDFRM(6)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt
index aa77bb221f1c..4df5309b1366 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=1930 Name=t2LDRD_PRE Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0 
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-LDR_POST-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-LDR_POST-arm.txt
index eef2c45db522..63b5dbf0c166 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-LDR_POST-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-LDR_POST-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep {invalid instruction encoding}
 # XFAIL: *
 
 # LDR_PRE/POST has encoding Inst{4} = 0.
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-LDR_PRE-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-LDR_PRE-arm.txt
index 197e34f3aff6..30cb727ece8f 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-LDR_PRE-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-LDR_PRE-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "potentially undefined instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "potentially undefined instruction encoding"
 
 # Opcode=165 Name=LDR_PRE Format=ARM_FORMAT_LDFRM(6)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-LDRrs-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-LDRrs-arm.txt
index af16e976d138..7b7286af123f 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-LDRrs-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-LDRrs-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # LDR (register) has encoding Inst{4} = 0.
 0xba 0xae 0x9f 0x57
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-MCR-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-MCR-arm.txt
index 575d0632f46c..bb4b06c90a62 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-MCR-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-MCR-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=171 Name=MCR Format=ARM_FORMAT_BRFRM(2)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-MOVTi16-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-MOVTi16-arm.txt
index d15ee055ec66..528563acb3fc 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-MOVTi16-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-MOVTi16-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=185 Name=MOVTi16 Format=ARM_FORMAT_DPFRM(4)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-MOVr-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-MOVr-arm.txt
index f8f055cb4a0c..41ec53f3c70b 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-MOVr-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-MOVr-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=0 Name=PHI Format=(42)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-MOVs-LSL-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-MOVs-LSL-arm.txt
index 3f682d8b7846..e5f2a5ecbc15 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-MOVs-LSL-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-MOVs-LSL-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=196 Name=MOVs Format=ARM_FORMAT_DPSOREGFRM(5)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-MOVs-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-MOVs-arm.txt
index 78acffe06646..3f4c1e5ff96b 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-MOVs-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-MOVs-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=0 Name=PHI Format=(42)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-MRRC2-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-MRRC2-arm.txt
index aaae6ce2e40a..c20ce542a6b2 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-MRRC2-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-MRRC2-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi 2>&1 | FileCheck %s
 
 # CHECK: invalid instruction encoding
 0x00 0x1a 0x50 0xfc
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-MSRi-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-MSRi-arm.txt
index b635a025f40d..901667ab9075 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-MSRi-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-MSRi-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=206 Name=MSRi Format=ARM_FORMAT_BRFRM(2)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-RFEorLDMIA-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-RFEorLDMIA-arm.txt
index 2b7d22c08359..499aa868f904 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-RFEorLDMIA-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-RFEorLDMIA-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=134 Name=LDMIA Format=ARM_FORMAT_LDSTMULFRM(10)
 # 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-SBFX-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-SBFX-arm.txt
index 48fe0f257862..7bc97d5260d4 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-SBFX-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-SBFX-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=271 Name=SBFX Format=ARM_FORMAT_DPFRM(4)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-SMLAD-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-SMLAD-arm.txt
index 5f39bb623453..fe4f43aadd7e 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-SMLAD-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-SMLAD-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=284 Name=SMLAD Format=ARM_FORMAT_MULFRM(1)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-SRS-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-SRS-arm.txt
index dc6788e2578f..eedd05cea624 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-SRS-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-SRS-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=0 Name=PHI Format=(42)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-STMIA_UPD-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-STMIA_UPD-thumb.txt
index 9709b0649e9a..3d5235de55d7 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-STMIA_UPD-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-STMIA_UPD-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=2313 Name=tSTMIA_UPD Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-SXTB-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-SXTB-arm.txt
index 4b70bdd80de3..f67f38e28e02 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-SXTB-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-SXTB-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=390 Name=SXTBr_rot Format=ARM_FORMAT_EXTFRM(14)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-UMAAL-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-UMAAL-arm.txt
index 57264017c951..f57c48f0e22b 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-UMAAL-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-UMAAL-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=419 Name=UMAAL Format=ARM_FORMAT_MULFRM(1)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-VLD1DUPq8_UPD-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-VLD1DUPq8_UPD-arm.txt
index ccf6d9f323f7..bce6b3bb6e6a 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-VLD1DUPq8_UPD-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-VLD1DUPq8_UPD-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-unknown-unknwon -mcpu=cortex-a8 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=armv7-unknown-unknwon -mcpu=cortex-a8 2>&1 | grep {invalid instruction encoding}
 # XFAIL: *
 
 # Opcode=737 Name=VLD1DUPq8_UPD Format=ARM_FORMAT_NLdSt(30)
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-VLD3DUPd32_UPD-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-VLD3DUPd32_UPD-thumb.txt
index d7d70f70f916..58def05f2783 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-VLD3DUPd32_UPD-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-VLD3DUPd32_UPD-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=871 Name=VLD3DUPd32_UPD Format=ARM_FORMAT_NLdSt(30)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-VLDMSDB_UPD-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-VLDMSDB_UPD-arm.txt
index 9c0d93e5f37a..54fcadb2a4f7 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-VLDMSDB_UPD-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-VLDMSDB_UPD-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # core registers out of range
 0xa5 0xba 0x72 0xed
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-VQADD-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-VQADD-arm.txt
index 7897142cae0c..7f8541e4941a 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-VQADD-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-VQADD-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-unknown-unknwon -mcpu=cortex-a8 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=armv7-unknown-unknwon -mcpu=cortex-a8 2>&1 | grep {invalid instruction encoding}
 # XFAIL: *
 
 # Opcode=1225 Name=VQADDsv16i8 Format=ARM_FORMAT_N3Reg(37)
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-VST1d8Twb_register-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-VST1d8Twb_register-thumb.txt
index 397584e4f749..2d2a62811ae9 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-VST1d8Twb_register-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-VST1d8Twb_register-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=1839 Name=VST1d8Twb_register Format=ARM_FORMAT_NLdSt(30)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-VST2b32_UPD-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-VST2b32_UPD-arm.txt
index b9d5d33f2c0d..911d7b325ff3 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-VST2b32_UPD-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-VST2b32_UPD-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-unknown-unknwon -mcpu=cortex-a8 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=armv7-unknown-unknwon -mcpu=cortex-a8 2>&1 | grep {invalid instruction encoding}
 # XFAIL: *
 
 # Opcode=1641 Name=VST2b32_UPD Format=ARM_FORMAT_NLdSt(30)
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-t2Bcc-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-t2Bcc-thumb.txt
index bbf415a5c16c..c9f1cf12d197 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-t2Bcc-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-t2Bcc-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=1894 Name=t2Bcc Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-t2LDRBT-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-t2LDRBT-thumb.txt
index 0a6120286201..eb415f755ebf 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-t2LDRBT-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-t2LDRBT-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=1922 Name=t2LDRBT Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-t2LDREXD-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-t2LDREXD-thumb.txt
index 7c0efab3834d..d16dcd71316a 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-t2LDREXD-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-t2LDREXD-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 2>&1 | grep {invalid instruction encoding}
 # XFAIL: *
 
 # Opcode=1934 Name=t2LDREXD Format=ARM_FORMAT_THUMBFRM(25)
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-t2LDRSHi12-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-t2LDRSHi12-thumb.txt
index 047121e5c4e7..7f84e0813096 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-t2LDRSHi12-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-t2LDRSHi12-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=1953 Name=t2LDRSHi12 Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-t2LDRSHi8-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-t2LDRSHi8-thumb.txt
index 57b50385efc4..e44cf952cd36 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-t2LDRSHi8-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-t2LDRSHi8-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=1954 Name=t2LDRSHi8 Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-t2PUSH-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-t2PUSH-thumb.txt
index 3348a42a3134..8c0d48bd56c0 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-t2PUSH-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-t2PUSH-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # SP and PC are not allowed in the register list on STM instructions in Thumb2.
 
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-t2STRD_PRE-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-t2STRD_PRE-thumb.txt
index 2198efc2d257..1877b538a17e 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-t2STRD_PRE-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-t2STRD_PRE-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 2>&1 | grep {invalid instruction encoding}
 # XFAIL: *
 
 # Opcode=2124 Name=t2STRD_PRE Format=ARM_FORMAT_THUMBFRM(25)
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-t2STREXB-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-t2STREXB-thumb.txt
index 3f406d49487b..27b91db09fc0 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-t2STREXB-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-t2STREXB-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 2>&1 | grep {invalid instruction encoding}
 # XFAIL: *
 
 # Opcode=2127 Name=t2STREXB Format=ARM_FORMAT_THUMBFRM(25)
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-t2STREXD-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-t2STREXD-thumb.txt
index 5721fe1bbf7a..7a7c4a5c54f5 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-t2STREXD-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-t2STREXD-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=2128 Name=t2STREXD Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/invalid-t2STR_POST-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-t2STR_POST-thumb.txt
index b957899f0632..2ad3e7df9ce3 100644
--- a/llvm/test/MC/Disassembler/ARM/invalid-t2STR_POST-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/invalid-t2STR_POST-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # Opcode=2137 Name=t2STR_POST Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/ldrd-armv4.txt b/llvm/test/MC/Disassembler/ARM/ldrd-armv4.txt
index bb87ade7869b..f2fff3f21c4a 100644
--- a/llvm/test/MC/Disassembler/ARM/ldrd-armv4.txt
+++ b/llvm/test/MC/Disassembler/ARM/ldrd-armv4.txt
@@ -1,5 +1,5 @@
-# RUN: llvm-mc --disassemble %s -triple=armv4-linux-gnueabi |& FileCheck %s -check-prefix=V4
-# RUN: llvm-mc --disassemble %s -triple=armv5te-linux-gnueabi |& FileCheck %s -check-prefix=V5TE
+# RUN: llvm-mc --disassemble %s -triple=armv4-linux-gnueabi 2>&1 | FileCheck %s -check-prefix=V4
+# RUN: llvm-mc --disassemble %s -triple=armv5te-linux-gnueabi 2>&1 | FileCheck %s -check-prefix=V5TE
 
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0 
 # -------------------------------------------------------------------------------------------------
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-ADC-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-ADC-arm.txt
index 275bae2fa28e..d5c8cbba9d36 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-ADC-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-ADC-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi 2>&1 | FileCheck %s
 
 # CHECK: potentially undefined
 # CHECK: 0x1f 0x12 0xb0 0x00
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-ADDREXT3-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-ADDREXT3-arm.txt
index 635b66ea43f0..d251eb4a303c 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-ADDREXT3-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-ADDREXT3-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi 2>&1 | FileCheck %s
 
 # CHECK: potentially undefined
 # CHECK: 0xd1 0xf1 0x5f 0x01
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-AExtI-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-AExtI-arm.txt
index 6f1da8eb2373..d0cb520e32d0 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-AExtI-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-AExtI-arm.txt
@@ -1,5 +1,5 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi |& FileCheck %s -check-prefix=CHECK-WARN
-# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi 2>&1 | FileCheck %s -check-prefix=CHECK-WARN
+# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi 2>&1 | FileCheck %s
 
 # CHECK-WARN: potentially undefined
 # CHECK-WARN: 0x74 0x03 0xaf 0x06
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-AI1cmp-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-AI1cmp-arm.txt
index dac4390cde8c..554ae5307621 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-AI1cmp-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-AI1cmp-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi 2>&1 | FileCheck %s
 
 # CHECK: potentially undefined
 # CHECK: 0x01 0x10 0x50 0x03
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-LDR-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-LDR-arm.txt
index ed5e350c13c8..66073a81be52 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-LDR-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-LDR-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi 2>&1 | FileCheck %s
 
 # CHECK: potentially undefined
 # CHECK: 0xff 0x00 0xb9 0x00
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-LDRD-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-LDRD-arm.txt
index a8f54f7127f2..572d84474ccb 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-LDRD-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-LDRD-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | FileCheck %s
 
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0 
 # -------------------------------------------------------------------------------------------------
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-LSL-regform.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-LSL-regform.txt
index f7d6bc6edcf6..9c269537dea2 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-LSL-regform.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-LSL-regform.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | FileCheck %s
 
 # Opcode=196 Name=MOVs Format=ARM_FORMAT_DPSOREGFRM(5)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-MRRC2-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-MRRC2-arm.txt
index 26b286dbf4ea..439aaed09780 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-MRRC2-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-MRRC2-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi 2>&1 | FileCheck %s
 
 # CHECK: potentially undefined
 # CHECK: 0x00 0x10 0x51 0xfc
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-MRS-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-MRS-arm.txt
index 3e472cdbfb14..d7853410d9d7 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-MRS-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-MRS-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | FileCheck %s
 
 # CHECK: warning: potentially undefined
 # CHECK: 0x00 0xf0 0x0f 0x01
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-MUL-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-MUL-arm.txt
index 3db86cc44fb6..472868fff66b 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-MUL-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-MUL-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi 2>&1 | FileCheck %s
 
 # CHECK: potentially undefined
 # CHECK: 0x93 0x12 0x01 0x00 
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-RSC-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-RSC-arm.txt
index 5b1361094990..fdfda6df838f 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-RSC-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-RSC-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | FileCheck %s
 
 # Opcode=261 Name=RSCrs Format=ARM_FORMAT_DPSOREGFRM(5)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-SEL-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-SEL-arm.txt
index d7939c19180f..a2a87703d08c 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-SEL-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-SEL-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi 2>&1 | FileCheck %s
 
 # CHECK: potentially undefined
 # CHECK: 0xb4 0x38 0x80 0x06
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-SHADD16-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-SHADD16-arm.txt
index 8ec49cad3499..741d0590abf8 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-SHADD16-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-SHADD16-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | FileCheck %s
 
 # CHECK: warning: potentially undefined
 # CHECK: shadd16	r5, r7, r0
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-SSAT-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-SSAT-arm.txt
index 874378ed024c..832aa3ffa30f 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-SSAT-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-SSAT-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | FileCheck %s
 
 # Opcode=322 Name=SSAT Format=ARM_FORMAT_SATFRM(13)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-STRBrs-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-STRBrs-arm.txt
index fef6125d283d..5e62802a3a40 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-STRBrs-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-STRBrs-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | FileCheck %s
 
 # Opcode=355 Name=STRBrs Format=ARM_FORMAT_STFRM(7)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-UQADD8-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-UQADD8-arm.txt
index 4c4c9abed2fc..85b52dd6aa60 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-UQADD8-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-UQADD8-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | FileCheck %s
 
 # Opcode=426 Name=UQADD8 Format=ARM_FORMAT_DPFRM(4)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictable-swp-arm.txt b/llvm/test/MC/Disassembler/ARM/unpredictable-swp-arm.txt
index 64bb171bf813..eef5d9fa9728 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictable-swp-arm.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictable-swp-arm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=armv7-linux-gnueabi 2>&1 | FileCheck %s
 
 # CHECK: potentially undefined
 # CHECK: 0x9f 0x10 0x03 0x01
diff --git a/llvm/test/MC/Disassembler/ARM/unpredictables-thumb.txt b/llvm/test/MC/Disassembler/ARM/unpredictables-thumb.txt
index e7645f0a59e3..925dcd38b6ab 100644
--- a/llvm/test/MC/Disassembler/ARM/unpredictables-thumb.txt
+++ b/llvm/test/MC/Disassembler/ARM/unpredictables-thumb.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7 |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=thumbv7 2>&1 | FileCheck %s
 
 0x01 0x47
 # CHECK: 3:1: warning: potentially undefined
diff --git a/llvm/test/MC/Disassembler/X86/enhanced.txt b/llvm/test/MC/Disassembler/X86/enhanced.txt
index 1922dc5eda5c..deff735b69db 100644
--- a/llvm/test/MC/Disassembler/X86/enhanced.txt
+++ b/llvm/test/MC/Disassembler/X86/enhanced.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --edis %s -triple=x86_64-apple-darwin9 |& FileCheck %s
+# RUN: llvm-mc --edis %s -triple=x86_64-apple-darwin9 2>&1 | FileCheck %s
 
 # CHECK: [o:jne][w:	][0-p:-][0-l:10=10] <br> 0:[RIP/112](pc)=18446744073709551606
 0x0f 0x85 0xf6 0xff 0xff 0xff
diff --git a/llvm/test/MC/Disassembler/X86/invalid-VEX-vvvv.txt b/llvm/test/MC/Disassembler/X86/invalid-VEX-vvvv.txt
index 9353d8a1f436..31a3804deccc 100644
--- a/llvm/test/MC/Disassembler/X86/invalid-VEX-vvvv.txt
+++ b/llvm/test/MC/Disassembler/X86/invalid-VEX-vvvv.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=x86_64-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=x86_64-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # This instruction would decode as movmskps if the vvvv field in the VEX prefix was all 1s.
 0xc5 0xf0 0x50 0xc0
diff --git a/llvm/test/MC/Disassembler/X86/invalid-cmp-imm.txt b/llvm/test/MC/Disassembler/X86/invalid-cmp-imm.txt
index c569ada40c9f..7b2ea2aa06c7 100644
--- a/llvm/test/MC/Disassembler/X86/invalid-cmp-imm.txt
+++ b/llvm/test/MC/Disassembler/X86/invalid-cmp-imm.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=x86_64-apple-darwin9 |& grep "invalid instruction encoding"
+# RUN: llvm-mc --disassemble %s -triple=x86_64-apple-darwin9 2>&1 | grep "invalid instruction encoding"
 
 # This instruction would decode as cmpordps if the immediate byte was less than 8.
 0x0f 0xc2 0xc7 0x08
diff --git a/llvm/test/MC/Disassembler/X86/truncated-input.txt b/llvm/test/MC/Disassembler/X86/truncated-input.txt
index 34cf0382a74c..83be1ca5db15 100644
--- a/llvm/test/MC/Disassembler/X86/truncated-input.txt
+++ b/llvm/test/MC/Disassembler/X86/truncated-input.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=x86_64-apple-darwin9 |& FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=x86_64-apple-darwin9 2>&1 | FileCheck %s
 
 # CHECK: warning
 0x00
diff --git a/llvm/test/Other/invalid-commandline-option.ll b/llvm/test/Other/invalid-commandline-option.ll
index 3af40dd55dec..583d4496dcc0 100644
--- a/llvm/test/Other/invalid-commandline-option.ll
+++ b/llvm/test/Other/invalid-commandline-option.ll
@@ -1,3 +1,3 @@
-; RUN: not opt --foo |& grep "Unknown command line argument"
+; RUN: not opt --foo 2>&1 | grep "Unknown command line argument"
 
 ; there is no --foo
diff --git a/llvm/test/Other/lint.ll b/llvm/test/Other/lint.ll
index ca2b1a336a18..c84f56f8f694 100644
--- a/llvm/test/Other/lint.ll
+++ b/llvm/test/Other/lint.ll
@@ -1,4 +1,4 @@
-; RUN: opt -basicaa -lint -disable-output < %s |& FileCheck %s
+; RUN: opt -basicaa -lint -disable-output < %s 2>&1 | FileCheck %s
 target datalayout = "e-p:64:64:64"
 
 declare fastcc void @bar()
diff --git a/llvm/test/Other/optimize-options.ll b/llvm/test/Other/optimize-options.ll
index 5b1fe52ac151..888a78fd9df4 100644
--- a/llvm/test/Other/optimize-options.ll
+++ b/llvm/test/Other/optimize-options.ll
@@ -1,8 +1,8 @@
-;RUN: opt -S -O1 -debug-pass=Arguments |& FileCheck %s
-;RUN: opt -S -O2 -debug-pass=Arguments |& FileCheck %s
-;RUN: opt -S -Os -debug-pass=Arguments |& FileCheck %s
-;RUN: opt -S -Oz -debug-pass=Arguments |& FileCheck %s
-;RUN: opt -S -O3 -debug-pass=Arguments |& FileCheck %s
+;RUN: opt -S -O1 -debug-pass=Arguments 2>&1 | FileCheck %s
+;RUN: opt -S -O2 -debug-pass=Arguments 2>&1 | FileCheck %s
+;RUN: opt -S -Os -debug-pass=Arguments 2>&1 | FileCheck %s
+;RUN: opt -S -Oz -debug-pass=Arguments 2>&1 | FileCheck %s
+;RUN: opt -S -O3 -debug-pass=Arguments 2>&1 | FileCheck %s
 
 ; Just check that we get a non-empty set of passes for each -O opton.
 ;CHECK: Pass Arguments: {{.*}} -print-module
diff --git a/llvm/test/Transforms/GVN/nonescaping-malloc.ll b/llvm/test/Transforms/GVN/nonescaping-malloc.ll
index 4bea58ca7b23..afcb7fe3bb0f 100644
--- a/llvm/test/Transforms/GVN/nonescaping-malloc.ll
+++ b/llvm/test/Transforms/GVN/nonescaping-malloc.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -gvn -stats -disable-output |& grep "Number of loads deleted"
+; RUN: opt < %s -basicaa -gvn -stats -disable-output 2>&1 | grep "Number of loads deleted"
 ; rdar://7363102
 
 ; GVN should be able to eliminate load %tmp22.i, because it is redundant with
diff --git a/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll b/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll
index 31548565745f..0f3efa09a1da 100644
--- a/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll
+++ b/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -stats -disable-output |& grep "1 globalopt - Number of global vars shrunk to booleans"
+; RUN: opt < %s -globalopt -stats -disable-output 2>&1 | grep "1 globalopt - Number of global vars shrunk to booleans"
 
 @Stop = internal global i32 0                     ; <i32*> [#uses=3]
 
diff --git a/llvm/test/Transforms/Inline/delete-call.ll b/llvm/test/Transforms/Inline/delete-call.ll
index c8624c04c7ee..7716d6a47bec 100644
--- a/llvm/test/Transforms/Inline/delete-call.ll
+++ b/llvm/test/Transforms/Inline/delete-call.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -S  -inline -functionattrs -stats |& grep "Number of call sites deleted, not inlined"
-; RUN: opt %s -S  -inline -stats |& grep "Number of functions inlined"
+; RUN: opt %s -S  -inline -functionattrs -stats 2>&1 | grep "Number of call sites deleted, not inlined"
+; RUN: opt %s -S  -inline -stats 2>&1 | grep "Number of functions inlined"
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-n8:16:32"
 target triple = "i386-apple-darwin9.8"
diff --git a/llvm/test/Transforms/LICM/hoist-invariant-load.ll b/llvm/test/Transforms/LICM/hoist-invariant-load.ll
index 4e100d3aee34..f9fc551df358 100644
--- a/llvm/test/Transforms/LICM/hoist-invariant-load.ll
+++ b/llvm/test/Transforms/LICM/hoist-invariant-load.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -stats -S |& grep "1 licm"
+; RUN: opt < %s -licm -stats -S 2>&1 | grep "1 licm"
 
 @"\01L_OBJC_METH_VAR_NAME_" = internal global [4 x i8] c"foo\00", section "__TEXT,__objc_methname,cstring_literals", align 1
 @"\01L_OBJC_SELECTOR_REFERENCES_" = internal global i8* getelementptr inbounds ([4 x i8]* @"\01L_OBJC_METH_VAR_NAME_", i32 0, i32 0), section "__DATA, __objc_selrefs, literal_pointers, no_dead_strip"
diff --git a/llvm/test/Transforms/LoopUnswitch/2008-11-03-Invariant.ll b/llvm/test/Transforms/LoopUnswitch/2008-11-03-Invariant.ll
index 20f2c2bfd742..9d73d31d5044 100644
--- a/llvm/test/Transforms/LoopUnswitch/2008-11-03-Invariant.ll
+++ b/llvm/test/Transforms/LoopUnswitch/2008-11-03-Invariant.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-unswitch -stats -disable-output |& grep "1 loop-unswitch - Number of branches unswitched" | count 1
+; RUN: opt < %s -loop-unswitch -stats -disable-output 2>&1 | grep "1 loop-unswitch - Number of branches unswitched" | count 1
 ; PR 3170
 define i32 @a(i32 %x, i32 %y) nounwind {
 entry:
diff --git a/llvm/test/Transforms/MergeFunc/phi-speculation1.ll b/llvm/test/Transforms/MergeFunc/phi-speculation1.ll
index 7b2a2fe5d52f..d05d028728d5 100644
--- a/llvm/test/Transforms/MergeFunc/phi-speculation1.ll
+++ b/llvm/test/Transforms/MergeFunc/phi-speculation1.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -mergefunc -stats -disable-output |& not grep {functions merged}
+; RUN: opt < %s -mergefunc -stats -disable-output 2>&1 | not grep {functions merged}
 
 define i32 @foo1(i32 %x) {
 entry:
diff --git a/llvm/test/Transforms/MergeFunc/phi-speculation2.ll b/llvm/test/Transforms/MergeFunc/phi-speculation2.ll
index 8829087d143c..eec8b5c5a90a 100644
--- a/llvm/test/Transforms/MergeFunc/phi-speculation2.ll
+++ b/llvm/test/Transforms/MergeFunc/phi-speculation2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -mergefunc -stats -disable-output |& grep "functions merged"
+; RUN: opt < %s -mergefunc -stats -disable-output 2>&1 | grep "functions merged"
 
 define i32 @foo1(i32 %x) {
 entry:
diff --git a/llvm/test/Transforms/MergeFunc/vector.ll b/llvm/test/Transforms/MergeFunc/vector.ll
index 96ba4a56aacb..4af079f8cdf7 100644
--- a/llvm/test/Transforms/MergeFunc/vector.ll
+++ b/llvm/test/Transforms/MergeFunc/vector.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -stats -disable-output < %s |& grep "functions merged"
+; RUN: opt -mergefunc -stats -disable-output < %s 2>&1 | grep "functions merged"
 
 ; This test is checks whether we can merge
 ;   vector<intptr_t>::push_back(0)
diff --git a/llvm/test/Transforms/TailCallElim/ackermann.ll b/llvm/test/Transforms/TailCallElim/ackermann.ll
index eb81564b669d..5b5dbcc225c1 100644
--- a/llvm/test/Transforms/TailCallElim/ackermann.ll
+++ b/llvm/test/Transforms/TailCallElim/ackermann.ll
@@ -1,5 +1,5 @@
 ; This function contains two tail calls, which should be eliminated
-; RUN: opt < %s -tailcallelim -stats -disable-output |& grep "2 tailcallelim"
+; RUN: opt < %s -tailcallelim -stats -disable-output 2>&1 | grep "2 tailcallelim"
 
 define i32 @Ack(i32 %M.1, i32 %N.1) {
 entry:
diff --git a/llvm/test/Transforms/TailCallElim/dup_tail.ll b/llvm/test/Transforms/TailCallElim/dup_tail.ll
index 37365311b341..42ac2f9dc4b9 100644
--- a/llvm/test/Transforms/TailCallElim/dup_tail.ll
+++ b/llvm/test/Transforms/TailCallElim/dup_tail.ll
@@ -1,5 +1,5 @@
 ; Duplicate the return into if.end to enable TCE.
-; RUN: opt %s -tailcallelim -stats -disable-output |& grep "Number of return duplicated"
+; RUN: opt %s -tailcallelim -stats -disable-output 2>&1 | grep "Number of return duplicated"
 
 define i32 @fib(i32 %n) nounwind ssp {
 entry:
diff --git a/llvm/test/Transforms/TailDup/2008-06-11-AvoidDupLoopHeader.ll b/llvm/test/Transforms/TailDup/2008-06-11-AvoidDupLoopHeader.ll
index 03e99bc9bf6a..7853d7ba06fb 100644
--- a/llvm/test/Transforms/TailDup/2008-06-11-AvoidDupLoopHeader.ll
+++ b/llvm/test/Transforms/TailDup/2008-06-11-AvoidDupLoopHeader.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -tailduplicate -taildup-threshold=3 -stats -disable-output |& not grep tailduplicate
+; RUN: opt < %s -tailduplicate -taildup-threshold=3 -stats -disable-output 2>&1 | not grep tailduplicate
 ; XFAIL: *
 
 define i32 @foo(i32 %l) nounwind  {
diff --git a/llvm/test/Verifier/2002-04-13-RetTypes.ll b/llvm/test/Verifier/2002-04-13-RetTypes.ll
index 2cbe6a922ee6..b36111271145 100644
--- a/llvm/test/Verifier/2002-04-13-RetTypes.ll
+++ b/llvm/test/Verifier/2002-04-13-RetTypes.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "value doesn't match function result type 'i32'"
+; RUN: not llvm-as < %s 2>&1 | grep "value doesn't match function result type 'i32'"
 
 ; Verify the the operand type of the ret instructions in a function match the
 ; delcared return type of the function they live in.
diff --git a/llvm/test/Verifier/2002-11-05-GetelementptrPointers.ll b/llvm/test/Verifier/2002-11-05-GetelementptrPointers.ll
index 98c43850b122..108ae5f76579 100644
--- a/llvm/test/Verifier/2002-11-05-GetelementptrPointers.ll
+++ b/llvm/test/Verifier/2002-11-05-GetelementptrPointers.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "invalid getelementptr indices"
+; RUN: not llvm-as < %s 2>&1 | grep "invalid getelementptr indices"
 
 ; This testcase is invalid because we are indexing into a pointer that is 
 ; contained WITHIN a structure.
diff --git a/llvm/test/Verifier/2006-07-11-StoreStruct.ll b/llvm/test/Verifier/2006-07-11-StoreStruct.ll
index 80ab122d0b7d..96d978d1dc0c 100644
--- a/llvm/test/Verifier/2006-07-11-StoreStruct.ll
+++ b/llvm/test/Verifier/2006-07-11-StoreStruct.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s |& not grep {Instruction operands must be first-class}
+; RUN: llvm-as < %s 2>&1 | not grep {Instruction operands must be first-class}
 
 ; This previously was for PR826, but structs are now first-class so
 ; the following is now valid.
diff --git a/llvm/test/Verifier/2006-12-12-IntrinsicDefine.ll b/llvm/test/Verifier/2006-12-12-IntrinsicDefine.ll
index aa26265791dc..6e7468c1d9eb 100644
--- a/llvm/test/Verifier/2006-12-12-IntrinsicDefine.ll
+++ b/llvm/test/Verifier/2006-12-12-IntrinsicDefine.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "llvm intrinsics cannot be defined"
+; RUN: not llvm-as < %s 2>&1 | grep "llvm intrinsics cannot be defined"
 ; PR1047
 
 define void @llvm.memcpy.p0i8.p0i8.i32(i8*, i8*, i32, i32, i1) {
diff --git a/llvm/test/Verifier/2008-03-01-AllocaSized.ll b/llvm/test/Verifier/2008-03-01-AllocaSized.ll
index 58f3098f9512..51258bef76e5 100644
--- a/llvm/test/Verifier/2008-03-01-AllocaSized.ll
+++ b/llvm/test/Verifier/2008-03-01-AllocaSized.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s -o /dev/null |& grep "Cannot allocate unsized type"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "Cannot allocate unsized type"
 ; PR2113
 
 define void @test() {
diff --git a/llvm/test/Verifier/2008-08-22-MemCpyAlignment.ll b/llvm/test/Verifier/2008-08-22-MemCpyAlignment.ll
index 65e884f46e3d..c6d5afd51c95 100644
--- a/llvm/test/Verifier/2008-08-22-MemCpyAlignment.ll
+++ b/llvm/test/Verifier/2008-08-22-MemCpyAlignment.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s -o /dev/null |& grep "alignment argument of memory intrinsics must be a constant int"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "alignment argument of memory intrinsics must be a constant int"
 ; PR2318
 
 define void @x(i8* %a, i8* %src, i64 %len, i32 %align) nounwind  {
diff --git a/llvm/test/Verifier/2008-11-15-RetVoid.ll b/llvm/test/Verifier/2008-11-15-RetVoid.ll
index f2cdc8ce4dec..42503fabbec9 100644
--- a/llvm/test/Verifier/2008-11-15-RetVoid.ll
+++ b/llvm/test/Verifier/2008-11-15-RetVoid.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "value doesn't match function result type 'void'"
+; RUN: not llvm-as < %s 2>&1 | grep "value doesn't match function result type 'void'"
 
 define void @foo() {
   ret i32 0
diff --git a/llvm/test/Verifier/AmbiguousPhi.ll b/llvm/test/Verifier/AmbiguousPhi.ll
index 58d8bdd3c64f..f31bc107accf 100644
--- a/llvm/test/Verifier/AmbiguousPhi.ll
+++ b/llvm/test/Verifier/AmbiguousPhi.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "multiple entries for the same basic block"
+; RUN: not llvm-as < %s 2>&1 | grep "multiple entries for the same basic block"
 
 
 
diff --git a/llvm/test/Verifier/PhiGrouping.ll b/llvm/test/Verifier/PhiGrouping.ll
index 0b677f2301c5..7b42fd28e3d8 100644
--- a/llvm/test/Verifier/PhiGrouping.ll
+++ b/llvm/test/Verifier/PhiGrouping.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "PHI nodes not grouped at top"
+; RUN: not llvm-as < %s 2>&1 | grep "PHI nodes not grouped at top"
 
 
 
diff --git a/llvm/test/Verifier/SelfReferential.ll b/llvm/test/Verifier/SelfReferential.ll
index 449ea36519cc..c24c0ebba3d1 100644
--- a/llvm/test/Verifier/SelfReferential.ll
+++ b/llvm/test/Verifier/SelfReferential.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s -o /dev/null |& grep "Only PHI nodes may reference their own value"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "Only PHI nodes may reference their own value"
 
 ; Test that self referential instructions are not allowed
 
diff --git a/llvm/test/Verifier/aliasing-chain.ll b/llvm/test/Verifier/aliasing-chain.ll
index 1275abaff399..a52e796b2b86 100644
--- a/llvm/test/Verifier/aliasing-chain.ll
+++ b/llvm/test/Verifier/aliasing-chain.ll
@@ -1,4 +1,4 @@
-; RUN:  not llvm-as %s -o /dev/null |& grep "Aliasing chain should end with function or global variable"
+; RUN:  not llvm-as %s -o /dev/null 2>&1 | grep "Aliasing chain should end with function or global variable"
 
 ; Test that alising chain does not create a cycle
 
diff --git a/llvm/test/Verifier/cttz-undef-arg.ll b/llvm/test/Verifier/cttz-undef-arg.ll
index 48cd061d3221..66c5396443ac 100644
--- a/llvm/test/Verifier/cttz-undef-arg.ll
+++ b/llvm/test/Verifier/cttz-undef-arg.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s -o /dev/null |& FileCheck %s
+; RUN: not llvm-as < %s -o /dev/null 2>&1 | FileCheck %s
 
 declare i32 @llvm.ctlz.i32(i32, i1)
 declare i32 @llvm.cttz.i32(i32, i1)
diff --git a/llvm/test/Verifier/dominates.ll b/llvm/test/Verifier/dominates.ll
index 50bfa616f0dc..17e2c3399967 100644
--- a/llvm/test/Verifier/dominates.ll
+++ b/llvm/test/Verifier/dominates.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s -o /dev/null |& FileCheck %s
+; RUN: not llvm-as < %s -o /dev/null 2>&1 | FileCheck %s
 
 define i32 @f1(i32 %x) {
        %y = add i32 %z, 1
diff --git a/llvm/test/Verifier/fpmath.ll b/llvm/test/Verifier/fpmath.ll
index b764a63f0a4a..7002c5c825f7 100644
--- a/llvm/test/Verifier/fpmath.ll
+++ b/llvm/test/Verifier/fpmath.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& FileCheck %s
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
 
 define void @fpmath1(i32 %i, float %f, <2 x float> %g) {
   %s = add i32 %i, %i, !fpmath !0
diff --git a/llvm/test/Verifier/invoke.ll b/llvm/test/Verifier/invoke.ll
index 2a0336b03f3b..06f40f00527a 100644
--- a/llvm/test/Verifier/invoke.ll
+++ b/llvm/test/Verifier/invoke.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s -o /dev/null |& FileCheck %s
+; RUN: not llvm-as < %s -o /dev/null 2>&1 | FileCheck %s
 
 ; PR1042
 define i32 @foo() {
diff --git a/llvm/test/Verifier/range-1.ll b/llvm/test/Verifier/range-1.ll
index 7a317fca8f2c..b6a75d13bba0 100644
--- a/llvm/test/Verifier/range-1.ll
+++ b/llvm/test/Verifier/range-1.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s -o /dev/null |& FileCheck %s
+; RUN: not llvm-as < %s -o /dev/null 2>&1 | FileCheck %s
 
 define void @f1(i8* %x) {
 entry:
diff --git a/llvm/test/YAMLParser/spec-05-02-utf8.data b/llvm/test/YAMLParser/spec-05-02-utf8.data
index b306bdb719ef..028f41bb557c 100644
--- a/llvm/test/YAMLParser/spec-05-02-utf8.data
+++ b/llvm/test/YAMLParser/spec-05-02-utf8.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 
 # Invalid use of BOM
 # inside a
diff --git a/llvm/test/YAMLParser/spec-05-10.data b/llvm/test/YAMLParser/spec-05-10.data
index 6788f0bfc31a..bab2c1b89ca3 100644
--- a/llvm/test/YAMLParser/spec-05-10.data
+++ b/llvm/test/YAMLParser/spec-05-10.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 
 commercial-at: @text
 grave-accent: `text
diff --git a/llvm/test/YAMLParser/spec-05-12.data b/llvm/test/YAMLParser/spec-05-12.data
index 7dadff76f8d7..eedfc08cf38a 100644
--- a/llvm/test/YAMLParser/spec-05-12.data
+++ b/llvm/test/YAMLParser/spec-05-12.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # We don't currently reject tabs as indentation.
 # XFAIL: *
diff --git a/llvm/test/YAMLParser/spec-05-15.data b/llvm/test/YAMLParser/spec-05-15.data
index cd8421ad2792..27dbd8396eaa 100644
--- a/llvm/test/YAMLParser/spec-05-15.data
+++ b/llvm/test/YAMLParser/spec-05-15.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 
 Bad escapes:
   "\c
diff --git a/llvm/test/YAMLParser/spec-07-03.data b/llvm/test/YAMLParser/spec-07-03.data
index 7ca948301691..c4a5299562a4 100644
--- a/llvm/test/YAMLParser/spec-07-03.data
+++ b/llvm/test/YAMLParser/spec-07-03.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 
 %YAML 1.1
 %YAML 1.1
diff --git a/llvm/test/YAMLParser/spec-07-05.data b/llvm/test/YAMLParser/spec-07-05.data
index 279b54afa142..f7cff3a8390c 100644
--- a/llvm/test/YAMLParser/spec-07-05.data
+++ b/llvm/test/YAMLParser/spec-07-05.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # We don't currently parse TAG directives.
 # XFAIL: *
diff --git a/llvm/test/YAMLParser/spec-08-04.data b/llvm/test/YAMLParser/spec-08-04.data
index f13538bc87e0..73c493d76379 100644
--- a/llvm/test/YAMLParser/spec-08-04.data
+++ b/llvm/test/YAMLParser/spec-08-04.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # We don't currently look at the content of literal tags.
 # XFAIL: *
diff --git a/llvm/test/YAMLParser/spec-08-06.data b/llvm/test/YAMLParser/spec-08-06.data
index a811bfdefe39..9844f53a4ef3 100644
--- a/llvm/test/YAMLParser/spec-08-06.data
+++ b/llvm/test/YAMLParser/spec-08-06.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # We don't currently validate tags.
 # XFAIL: *
diff --git a/llvm/test/YAMLParser/spec-09-02.data b/llvm/test/YAMLParser/spec-09-02.data
index f69037820ebd..9d8a58ca33ae 100644
--- a/llvm/test/YAMLParser/spec-09-02.data
+++ b/llvm/test/YAMLParser/spec-09-02.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # Indent trimming is not yet implemented.
 # XFAIL: *
diff --git a/llvm/test/YAMLParser/spec-09-14.data b/llvm/test/YAMLParser/spec-09-14.data
index 890f6bf2e718..a83fcd45e2c0 100644
--- a/llvm/test/YAMLParser/spec-09-14.data
+++ b/llvm/test/YAMLParser/spec-09-14.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # Not quite sure why this doesn't fail.
 # XFAIL: *
diff --git a/llvm/test/YAMLParser/spec-09-21.data b/llvm/test/YAMLParser/spec-09-21.data
index 2bcc28337f9f..6eb7917a97e3 100644
--- a/llvm/test/YAMLParser/spec-09-21.data
+++ b/llvm/test/YAMLParser/spec-09-21.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 
 - |
 
diff --git a/llvm/test/YAMLParser/spec-10-08.data b/llvm/test/YAMLParser/spec-10-08.data
index 5b981e983392..53faeb9e001b 100644
--- a/llvm/test/YAMLParser/spec-10-08.data
+++ b/llvm/test/YAMLParser/spec-10-08.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # This fails because even without a key token, some contexts (in this case flow
 # maps) allow implicit null keys, which mix with this in weird ways.