gdb/testsuite/

	* gdb.threads/non-ldr-exc-1.exp (do_test): Fix the indent of
	using with_test_prefix.
	* gdb.threads/non-ldr-exc-2.exp (do_test): Likewise.
	* gdb.threads/non-ldr-exc-3.exp (do_test): Likewise.
	* gdb.threads/non-ldr-exc-4.exp (do_test): Likewise.
	* gdb.threads/watchpoint-fork.exp (test): Likewise.
	* gdb.base/break-interp.exp (test_core): Likewise.
	(test_attach_gdb): Likewise.
	* gdb.base/catch-load.exp (one_catch_load_test): Likewise.
	* gdb.base/disp-step-syscall.exp (disp_step_cross_syscall):
	Likewise.
	* gdb.base/jit-so.exp (one_jit_test): Likewise.
	* gdb.base/jit.exp (one_jit_test): Likewise.
	* gdb.base/sepdebug.exp (test_different_dir): Likewise.
	* gdb.dwarf2/dw2-dir-file-name.exp (test): Likewise.
	* gdb.dwarf2/dw2-noloc.exp (file_symbols): Likewise.
	* gdb.mi/mi-breakpoint-changed.exp (test_pending_resolved):
	Likewise.
	* gdb.mi/mi-cmd-param-changed.exp (test_command_param_changed):
	Likewise.
	* gdb.mi/mi-watch.exp test_watchpoint_all): Likewise.
	* gdb.mi/pr11022.exp (test_memory_changed_observer): Likewise.
	* gdb.trace/change-loc.exp (tracepoint_change_loc_1): Likewise.
	(tracepoint_change_loc_2): Likewise.
	* gdb.trace/disconnected-tracing.exp (disconnected_tracing):
	Likewise.
	(disconnected_tfind): Likewise.
	* gdb.trace/mi-traceframe-changed.exp (test_tfind_tfile):
	Likewise.
	(test_tfind_remote): Likewise.
	* gdb.trace/mi-tracepoint-changed.exp (test_reconnect):
	Likewise.
	(test_pending_resolved): Likewise.
	* gdb.trace/mi-tsv-changed.exp (test_create_delete_modify_tsv):
	Likewise.
	(test_upload_tsv): Likewise.
	* gdb.trace/pending.exp (pending_tracepoint_resolved):
	Likewise.
	(pending_tracepoint_works): Likewise.
	* gdb.trace/report.exp (use_collected_data): Likewise.
	* gdb.trace/status-stop.exp (test_tstart_tstop_tstart):
	Likewise.
	(test_tstart_tstart, test_buffer_full_tstart): Likewise.
	* gdb.trace/strace.exp (strace_info_marker): Likewise.
	(strace_trace_on_same_addr): Likewise.
	(strace_trace_on_diff_addr): Likewise.
	* gdb.trace/unavailable.exp (gdb_collect_args_test): Likewise.
	(gdb_collect_locals_test): Likewise.
	(gdb_unavailable_registers_test): Likewise.
	(gdb_collect_globals_test): Likewise.

1 files changed, 61 insertions, 52 deletions

diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp
index 044e18f..bca03d2 100644
--- a/gdb/testsuite/gdb.trace/status-stop.exp
+++ b/gdb/testsuite/gdb.trace/status-stop.exp
@@ -37,72 +37,81 @@ if ![gdb_target_supports_trace] {
 
 # Verify that the sequence of commands "tstart tstop tstart" works well.
 
-proc test_tstart_tstop_tstart { } { with_test_prefix "tstart_tstop_tstart" {
-    global executable
-    global hex
-
-    # Start with a fresh gdb.
-    clean_restart ${executable}
-    if ![runto_main] {
-        fail "Can't run to main"
-        return -1
-    }
-
-    gdb_test "trace func1" "Tracepoint \[0-9\] at $hex: file.*"
-    gdb_test_no_output "tstart"
-
-    gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
-    gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end"
+proc test_tstart_tstop_tstart { } {
+    with_test_prefix "tstart_tstop_tstart" {
+	global executable
+	global hex
 
-    gdb_test_no_output "tstop"
+	# Start with a fresh gdb.
+	clean_restart ${executable}
+	if ![runto_main] {
+	    fail "Can't run to main"
+	    return -1
+	}
 
-    gdb_test_no_output "tstart"
-}}
+	gdb_test "trace func1" "Tracepoint \[0-9\] at $hex: file.*"
+	gdb_test_no_output "tstart"
 
-# Verify the sequence of commands "tstart tstart" works well.
+	gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
+	gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" \
+	    "continue to end"
 
-proc test_tstart_tstart { } { with_test_prefix "tstart_tstart" {
-    global executable
-    global hex
+	gdb_test_no_output "tstop"
 
-    # Start with a fresh gdb.
-    clean_restart ${executable}
-    if ![runto_main] {
-        fail "Can't run to main"
-        return -1
+	gdb_test_no_output "tstart"
     }
+}
 
-    gdb_test "trace func1" "Tracepoint \[0-9\] at $hex: file.*"
-    gdb_test_no_output "tstart"
+# Verify the sequence of commands "tstart tstart" works well.
 
-    gdb_test "tstart" "" "tstart again" "A trace is running already.  Start a new run\\? \\(y or n\\) " "y"
-}}
+proc test_tstart_tstart { } {
+    with_test_prefix "tstart_tstart" {
+	global executable
+	global hex
 
-# Verify that trace stops clearly when trace buffer is full.
+	# Start with a fresh gdb.
+	clean_restart ${executable}
+	if ![runto_main] {
+	    fail "Can't run to main"
+	    return -1
+	}
 
-proc test_buffer_full_tstart { } { with_test_prefix "buffer_full_tstart" {
-    global executable
-    global hex
+	gdb_test "trace func1" "Tracepoint \[0-9\] at $hex: file.*"
+	gdb_test_no_output "tstart"
 
-    # Start with a fresh gdb.
-    clean_restart ${executable}
-    if ![runto_main] {
-        fail "Can't run to main"
-        return -1
+	gdb_test "tstart" "" "tstart again" \
+	    "A trace is running already.  Start a new run\\? \\(y or n\\) " \
+	    "y"
     }
+}
 
-    gdb_test "trace func2" "Tracepoint \[0-9\] at $hex: file.*"
-    gdb_trace_setactions "collect buf: define actions" \
-	"" \
-	"collect buf" "^$"
-
-    gdb_test_no_output "tstart"
-    gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
-    gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end"
+# Verify that trace stops clearly when trace buffer is full.
 
-    gdb_test "tstatus" ".*buffer was full.*"
-    gdb_test_no_output "tstart"
-}}
+proc test_buffer_full_tstart { } {
+    with_test_prefix "buffer_full_tstart" {
+	global executable
+	global hex
+
+	# Start with a fresh gdb.
+	clean_restart ${executable}
+	if ![runto_main] {
+	    fail "Can't run to main"
+	    return -1
+	}
+
+	gdb_test "trace func2" "Tracepoint \[0-9\] at $hex: file.*"
+	gdb_trace_setactions "collect buf: define actions" \
+	    "" \
+	    "collect buf" "^$"
+
+	gdb_test_no_output "tstart"
+	gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
+	gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end"
+
+	gdb_test "tstatus" ".*buffer was full.*"
+	gdb_test_no_output "tstart"
+    }
+}
 
 test_tstart_tstop_tstart