Index: lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit
===================================================================
--- lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit
+++ lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit
@@ -0,0 +1 @@
+target stop-hook add -n b -o "expr ptr"
Index: lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
===================================================================
--- lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
+++ lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit
@@ -0,0 +1 @@
+target stop-hook add -f stop-hook.c -l 30 -e 34 -o "expr ptr"
\ No newline at end of file
Index: lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
===================================================================
--- lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
+++ lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit
@@ -0,0 +1,3 @@
+target stop-hook add -f stop-hook.c -l 30 -e 34
+expr ptr
+DONE
\ No newline at end of file
Index: lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit
===================================================================
--- lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit
+++ lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit
@@ -0,0 +1,7 @@
+break set -f stop-hook-threads.cpp -p "Break here to test that the stop-hook"
+run
+target stop-hook add
+frame variable --show-globals g_val
+thread list
+continue
+DONE
Index: lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit
===================================================================
--- lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit
+++ lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit
@@ -0,0 +1,4 @@
+break set -f stop-hook-threads.cpp -p "Break here to test that the stop-hook"
+run
+target stop-hook add -x 2 -o "frame variable thread_index"
+target stop-hook add -o continue
Index: lldb/trunk/lit/ExecControl/StopHook/stop-hook-threads.test
===================================================================
--- lldb/trunk/lit/ExecControl/StopHook/stop-hook-threads.test
+++ lldb/trunk/lit/ExecControl/StopHook/stop-hook-threads.test
@@ -1,19 +1,7 @@
 # RUN: %cxx %p/Inputs/stop-hook-threads.cpp -g -o %t
-# RUN: %lldb -b -s %s -O 'target create %t' \
-# RUN:     -O 'break set -f stop-hook-threads.cpp -p "Break here to test that the stop-hook"' \
-# RUN:     -O run \
-# RUN:     -O 'target stop-hook add' \
-# RUN:            -O "frame variable --show-globals g_val" \
-# RUN:            -O "thread list" \
-# RUN:            -O continue \
-# RUN:            -O DONE \
+# RUN: %lldb -b -s %p/Inputs/stop-hook-threads-1.lldbinit -s %s -f %t \
 # RUN:     | FileCheck --check-prefix=CHECK --check-prefix=CHECK-NO-FILTER %s
-# RUN: %lldb -b -s %s \
-# RUN:     -O 'target create %t' \
-# RUN:     -O 'break set -f stop-hook-threads.cpp -p "Break here to test that the stop-hook"' \
-# RUN:     -O run \
-# RUN:     -O 'target stop-hook add -x 2 -o "frame variable thread_index"' \
-# RUN:     -O 'target stop-hook add -o continue' \
+# RUN: %lldb -b -s %p/Inputs/stop-hook-threads-2.lldbinit -s %s -f %t \
 # RUN:     | FileCheck --check-prefix=CHECK --check-prefix=CHECK-FILTER %s
 
 thread list
Index: lldb/trunk/lit/ExecControl/StopHook/stop-hook.test
===================================================================
--- lldb/trunk/lit/ExecControl/StopHook/stop-hook.test
+++ lldb/trunk/lit/ExecControl/StopHook/stop-hook.test
@@ -1,11 +1,11 @@
 # RUN: %cc %p/Inputs/stop-hook.c -g -o %t
 # Test setting stop-hook per-function
-# RUN: %lldb -b -s %s -O 'target create %t' -O 'target stop-hook add -n b -o "expr ptr"' \
+# RUN: %lldb -b -s %p/Inputs/stop-hook-1.lldbinit -s %s -f %t \
 # RUN:      | FileCheck --check-prefix=CHECK --check-prefix=CHECK-FUNC %s
 # Test setting stop-hook per-line range
-# RUN: %lldb -b -s %s -O 'target create %t' -O 'target stop-hook add -f stop-hook.c -l 30 -e 34 -o "expr ptr"'  | FileCheck %s
+# RUN: %lldb -b -s %p/Inputs/stop-hook-2.lldbinit -s %s -f %t | FileCheck %s
 # Test setting stop-hook with multi-line expression
-# RUN: %lldb -b -s %s -O 'target create %t' -O 'target stop-hook add -f stop-hook.c -l 30 -e 34' -O 'expr ptr' -O DONE | FileCheck %s
+# RUN: %lldb -b -s %p/Inputs/stop-hook-3.lldbinit -s %s -f %t | FileCheck %s
 
 break set -f stop-hook.c -p "// Set breakpoint here to test target stop-hook"
 break set -f stop-hook.c -p "// Another breakpoint which is outside of the stop-hook range"