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, 65 insertions, 63 deletions

diff --git a/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp b/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp
index 69a3d6e..7fc025f 100644
--- a/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp
@@ -23,78 +23,80 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-proc test_command_param_changed { } { with_test_prefix "cmd param" {
-    if [mi_gdb_start] {
-	return
-    }
-    mi_run_to_main
-
-    foreach opt { "on" "off" "step" } {
-	mi_gdb_test "set scheduler-locking ${opt}" \
-	    ".*=cmd-param-changed,param=\"scheduler-locking\",value=\"${opt}\".*\\^done" \
-	    "\"set scheduler-locking ${opt}\""
-    }
-    foreach opt { "on" "off" "step" } {
-	mi_gdb_test "interpreter-exec console \"set scheduler-locking ${opt}\"" \
-	    ".*=cmd-param-changed,param=\"scheduler-locking\",value=\"${opt}\".*\\^done" \
-	    "interpreter-exec \"set scheduler-locking ${opt}\""
-    }
-    # Don't emit MI notification for request from MI.
-    mi_gdb_test "-gdb-set scheduler-locking on" \
-	{\^done} \
-	"\"set scheduler-locking on\" no event (requested by MI)"
-
-    mi_gdb_test "interpreter-exec mi \"-gdb-set scheduler-locking step\"" \
-	"\\&\"interpreter-exec mi .*\"-gdb-set scheduler-locking step.*\"\\\\n\"\r\n\\^done\r\n\\^done" \
-	"\"set scheduler-locking step\" no event (requested by MI interp)"
-    mi_gdb_test "set scheduler-locking step" \
-	"\\&\"set scheduler-locking step\\\\n\"\r\n\\^done" \
-	"\"set scheduler-locking stepr\" no event"
+proc test_command_param_changed { } {
+    with_test_prefix "cmd param" {
+	if [mi_gdb_start] {
+	    return
+	}
+	mi_run_to_main
 
+	foreach opt { "on" "off" "step" } {
+	    mi_gdb_test "set scheduler-locking ${opt}" \
+		".*=cmd-param-changed,param=\"scheduler-locking\",value=\"${opt}\".*\\^done" \
+		"\"set scheduler-locking ${opt}\""
+	}
+	foreach opt { "on" "off" "step" } {
+	    mi_gdb_test "interpreter-exec console \"set scheduler-locking ${opt}\"" \
+		".*=cmd-param-changed,param=\"scheduler-locking\",value=\"${opt}\".*\\^done" \
+		"interpreter-exec \"set scheduler-locking ${opt}\""
+	}
+	# Don't emit MI notification for request from MI.
+	mi_gdb_test "-gdb-set scheduler-locking on" \
+	    {\^done} \
+	    "\"set scheduler-locking on\" no event (requested by MI)"
+
+	mi_gdb_test "interpreter-exec mi \"-gdb-set scheduler-locking step\"" \
+	    "\\&\"interpreter-exec mi .*\"-gdb-set scheduler-locking step.*\"\\\\n\"\r\n\\^done\r\n\\^done" \
+	    "\"set scheduler-locking step\" no event (requested by MI interp)"
+	mi_gdb_test "set scheduler-locking step" \
+	    "\\&\"set scheduler-locking step\\\\n\"\r\n\\^done" \
+	    "\"set scheduler-locking stepr\" no event"
+
+
+	foreach command { "remotecache" "check type" } {
+
+	    # The default value of each command option may be different, so we first
+	    # set it to 'off', and this may or may not trigger MI notification.
+	    mi_gdb_test "set ${command} off" ".*\\^done" "\"set ${command}\" warmup"
+
+	    foreach boolean_opt { "on" "off" } {
+		mi_gdb_test "set ${command} ${boolean_opt}" \
+		    ".*=cmd-param-changed,param=\"${command}\",value=\"${boolean_opt}\".*\\^done" \
+		    "\"set ${command} ${boolean_opt}\""
+	    }
+	    mi_gdb_test "set ${command} off" \
+		"\\&\"set ${command} off\\\\n\"\r\n\\^done" \
+		"\"set ${command}\" no event"
+	}
 
-    foreach command { "remotecache" "check type" } {
 
-	# The default value of each command option may be different, so we first
-	# set it to 'off', and this may or may not trigger MI notification.
-	mi_gdb_test "set ${command} off" ".*\\^done" "\"set ${command}\" warmup"
+	foreach command { "trace-notes" "remote exec-file" } {
+	    foreach str_opt { "foo" "bar" } {
+		mi_gdb_test "set ${command} ${str_opt}" \
+		    ".*=cmd-param-changed,param=\"${command}\",value=\"${str_opt}\".*\\^done" \
+		    "\"set ${command} ${str_opt}\""
+	    }
+	    mi_gdb_test "set ${command} bar" \
+		"\\&\"set ${command} bar\\\\n\"\r\n(\\&\"warning.*|)\\^done" \
+		"\"set ${command} bar\" no event"
+	}
 
+	# No notification is emitted for 'maint set' commands.
 	foreach boolean_opt { "on" "off" } {
-	    mi_gdb_test "set ${command} ${boolean_opt}" \
-		".*=cmd-param-changed,param=\"${command}\",value=\"${boolean_opt}\".*\\^done" \
-		"\"set ${command} ${boolean_opt}\""
+	    mi_gdb_test "maint set profile ${boolean_opt}" \
+		"\\&\"maint set profile ${boolean_opt}\\\\n\"\r\n\\^done" \
+		"\"maint set profile ${boolean_opt}\""
 	}
-	mi_gdb_test "set ${command} off" \
-	    "\\&\"set ${command} off\\\\n\"\r\n\\^done" \
-	    "\"set ${command}\" no event"
-    }
 
+	# Full command parameters are included in the notification when a
+	# abbreviated one is typed.
+	mi_gdb_test "set ch type on" \
+	    ".*=cmd-param-changed,param=\"check type\",value=\"on\".*\\^done" \
+	    "\"set ch type on\""
 
-    foreach command { "trace-notes" "remote exec-file" } {
-	foreach str_opt { "foo" "bar" } {
-	    mi_gdb_test "set ${command} ${str_opt}" \
-		".*=cmd-param-changed,param=\"${command}\",value=\"${str_opt}\".*\\^done" \
-		"\"set ${command} ${str_opt}\""
-	}
-	mi_gdb_test "set ${command} bar" \
-	    "\\&\"set ${command} bar\\\\n\"\r\n(\\&\"warning.*|)\\^done" \
-	    "\"set ${command} bar\" no event"
-    }
-
-    # No notification is emitted for 'maint set' commands.
-    foreach boolean_opt { "on" "off" } {
-	mi_gdb_test "maint set profile ${boolean_opt}" \
-	    "\\&\"maint set profile ${boolean_opt}\\\\n\"\r\n\\^done" \
-	    "\"maint set profile ${boolean_opt}\""
+	mi_gdb_exit
     }
-
-    # Full command parameters are included in the notification when a
-    # abbreviated one is typed.
-    mi_gdb_test "set ch type on" \
-	".*=cmd-param-changed,param=\"check type\",value=\"on\".*\\^done" \
-	"\"set ch type on\""
-
-    mi_gdb_exit
-}}
+}
 
 test_command_param_changed