0300a2e
Index: gdb-7.11.90.20160904/gdb/infrun.c
407ebe9
===================================================================
0300a2e
--- gdb-7.11.90.20160904.orig/gdb/infrun.c	2016-09-04 17:57:12.733853848 +0200
0300a2e
+++ gdb-7.11.90.20160904/gdb/infrun.c	2016-09-04 17:57:45.568145391 +0200
0300a2e
@@ -2218,7 +2218,7 @@
23f398e
   schedlock_replay,
c78c51c
   NULL
c78c51c
 };
23f398e
-static const char *scheduler_mode = schedlock_replay;
c78c51c
+static const char *scheduler_mode = schedlock_step;
c78c51c
 static void
c78c51c
 show_scheduler_mode (struct ui_file *file, int from_tty,
c78c51c
 		     struct cmd_list_element *c, const char *value)
0300a2e
Index: gdb-7.11.90.20160904/gdb/testsuite/gdb.mi/mi-cli.exp
407ebe9
===================================================================
0300a2e
--- gdb-7.11.90.20160904.orig/gdb/testsuite/gdb.mi/mi-cli.exp	2016-09-04 17:57:12.733853848 +0200
0300a2e
+++ gdb-7.11.90.20160904/gdb/testsuite/gdb.mi/mi-cli.exp	2016-09-04 17:57:45.569145399 +0200
0300a2e
@@ -199,7 +199,7 @@
2280d55
 # Test that the token is output even for CLI commands
2280d55
 # Also test that *stopped includes frame information.
2280d55
 mi_gdb_test "34 next" \
2280d55
-    ".*34\\\^running.*\\*running,thread-id=\"all\"" \
2280d55
+    ".*34\\\^running.*\\*running,thread-id=\"1\"" \
2280d55
     "34 next: run"
2280d55
 
eb6cb2d
 # Test that the new current source line is output to the console
0300a2e
Index: gdb-7.11.90.20160904/gdb/testsuite/gdb.mi/mi-logging.exp
11eae30
===================================================================
0300a2e
--- gdb-7.11.90.20160904.orig/gdb/testsuite/gdb.mi/mi-logging.exp	2016-09-04 17:57:12.733853848 +0200
0300a2e
+++ gdb-7.11.90.20160904/gdb/testsuite/gdb.mi/mi-logging.exp	2016-09-04 17:57:45.569145399 +0200
0300a2e
@@ -53,7 +53,7 @@
11eae30
 
11eae30
 set mi_log_prompt "\[(\]gdb\[)\] \[\r\n\]+"
11eae30
 
11eae30
-if [regexp "\\^done\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {
11eae30
+if [regexp "\\^done\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"1\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"1\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {
11eae30
     pass "Log file contents"
11eae30
 } else {
11eae30
     fail "Log file contents"
0300a2e
@@ -76,7 +76,7 @@
11eae30
 set logcontent [read $chan]
11eae30
 close $chan
11eae30
 
11eae30
-if [regexp "1001\\^done\[\r\n\]+$mi_log_prompt.*1002\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt.*1003\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {
11eae30
+if [regexp "1001\\^done\[\r\n\]+$mi_log_prompt.*1002\\^running\[\r\n\]+\\*running,thread-id=\"1\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt.*1003\\^running\[\r\n\]+\\*running,thread-id=\"1\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {
11eae30
     pass "Redirect log file contents"
11eae30
 } else {
11eae30
     fail "Redirect log file contents"
0300a2e
Index: gdb-7.11.90.20160904/gdb/testsuite/gdb.mi/mi-console.exp
556378e
===================================================================
0300a2e
--- gdb-7.11.90.20160904.orig/gdb/testsuite/gdb.mi/mi-console.exp	2016-09-04 17:57:12.733853848 +0200
0300a2e
+++ gdb-7.11.90.20160904/gdb/testsuite/gdb.mi/mi-console.exp	2016-09-04 17:57:45.569145399 +0200
0300a2e
@@ -60,6 +60,9 @@
556378e
 
556378e
 mi_run_to_main
556378e
 
556378e
+# thread-id=\"all\" vs. thread-id=\"1\" below:
556378e
+mi_gdb_test "210-gdb-set scheduler-locking off" "210\\^done" "set scheduler-locking off"
556378e
+
2c55a54
 # The output we get from the target depends on how it is hosted.  If
2c55a54
 # we are semihosted (e.g., the sim or a remote target that supports
2c55a54
 # the File I/O remote protocol extension), we see the target I/O
0300a2e
Index: gdb-7.11.90.20160904/gdb/testsuite/gdb.opt/inline-cmds.exp
0300a2e
===================================================================
0300a2e
--- gdb-7.11.90.20160904.orig/gdb/testsuite/gdb.opt/inline-cmds.exp	2016-09-04 17:59:44.600202299 +0200
0300a2e
+++ gdb-7.11.90.20160904/gdb/testsuite/gdb.opt/inline-cmds.exp	2016-09-04 18:00:04.616380027 +0200
0300a2e
@@ -331,7 +331,7 @@
0300a2e
 
0300a2e
     send_gdb "interpreter-exec console \"step\"\n"
0300a2e
     gdb_expect {
0300a2e
-	-re "\\^running\r\n\\*running,thread-id=\"all\"\r\n${mi_gdb_prompt}${cli_output_re}" {
0300a2e
+	-re "\\^running\r\n\\*running,thread-id=\"1\"\r\n${mi_gdb_prompt}${cli_output_re}" {
0300a2e
 	    pass $message
0300a2e
 	}
0300a2e
 	timeout {