Index: test/CodeGen/AMDGPU/private-memory-broken.ll
===================================================================
--- test/CodeGen/AMDGPU/private-memory-broken.ll
+++ test/CodeGen/AMDGPU/private-memory-broken.ll
@@ -1,12 +1,12 @@
-; RUN: not llc -verify-machineinstrs -march=amdgcn -mcpu=SI -exit-on-error %s -o /dev/null 2>&1 | FileCheck %s
-; RUN: not llc -verify-machineinstrs -march=amdgcn -mcpu=tonga -exit-on-error %s -o /dev/null 2>&1 | FileCheck %s
+; RUN: not llc -verify-machineinstrs -march=amdgcn -mcpu=SI %s -o /dev/null 2>&1 | FileCheck %s
+; RUN: not llc -verify-machineinstrs -march=amdgcn -mcpu=tonga %s -o /dev/null 2>&1 | FileCheck %s

 ; Make sure promote alloca pass doesn't crash

 ; CHECK: unsupported call

 declare i32 @foo(i32*) nounwind

 define void @call_private(i32 addrspace(1)* %out, i32 %in) nounwind {
 entry:
   %tmp = alloca [2 x i32]
Index: test/CodeGen/AMDGPU/promote-alloca-bitcast-function.ll
===================================================================
--- test/CodeGen/AMDGPU/promote-alloca-bitcast-function.ll
+++ test/CodeGen/AMDGPU/promote-alloca-bitcast-function.ll
@@ -1,22 +1,22 @@
-; RUN: not llc -march=amdgcn -exit-on-error < %s 2>&1 | FileCheck %s
+; RUN: not llc -march=amdgcn < %s 2>&1 | FileCheck %s

 ; Make sure that AMDGPUPromoteAlloca doesn't crash if the called
 ; function is a constantexpr cast of a function.

 declare void @foo(float*) #0
 declare void @foo.varargs(...) #0

 ; CHECK: in function crash_call_constexpr_cast{{.*}}: unsupported call to function foo
 define void @crash_call_constexpr_cast() #0 {
   %alloca = alloca i32
   call void bitcast (void (float*)* @foo to void (i32*)*)(i32* %alloca) #0
   ret void
 }

 define void @crash_call_constexpr_cast_varargs() #0 {
   %alloca = alloca i32
   call void bitcast (void (...)* @foo.varargs to void (i32*)*)(i32* %alloca) #0
   ret void
 }

 attributes #0 = { nounwind }