]>
Commit | Line | Data |
---|---|---|
a7de96f0 | 1 | Index: gdb-7.4.50.20120703/gdb/infrun.c |
3a58abaf | 2 | =================================================================== |
a7de96f0 PS |
3 | --- gdb-7.4.50.20120703.orig/gdb/infrun.c 2012-07-03 20:26:25.060940765 +0200 |
4 | +++ gdb-7.4.50.20120703/gdb/infrun.c 2012-07-03 20:26:32.808929860 +0200 | |
5 | @@ -1591,7 +1591,7 @@ static const char *const scheduler_enums | |
3a58abaf AM |
6 | schedlock_step, |
7 | NULL | |
8 | }; | |
9 | -static const char *scheduler_mode = schedlock_off; | |
10 | +static const char *scheduler_mode = schedlock_step; | |
11 | static void | |
12 | show_scheduler_mode (struct ui_file *file, int from_tty, | |
13 | struct cmd_list_element *c, const char *value) | |
a7de96f0 | 14 | Index: gdb-7.4.50.20120703/gdb/testsuite/gdb.mi/mi-console.exp |
3a58abaf | 15 | =================================================================== |
a7de96f0 PS |
16 | --- gdb-7.4.50.20120703.orig/gdb/testsuite/gdb.mi/mi-console.exp 2012-07-03 20:26:25.060940765 +0200 |
17 | +++ gdb-7.4.50.20120703/gdb/testsuite/gdb.mi/mi-console.exp 2012-07-03 20:26:32.809929858 +0200 | |
18 | @@ -46,6 +46,9 @@ if { [gdb_compile "${srcdir}/${subdir}/ | |
3a58abaf AM |
19 | |
20 | mi_run_to_main | |
21 | ||
22 | +# thread-id=\"all\" vs. thread-id=\"1\" below: | |
23 | +mi_gdb_test "210-gdb-set scheduler-locking off" "210\\^done" "set scheduler-locking off" | |
24 | + | |
25 | # Next over the hello() call which will produce lots of output | |
26 | mi_gdb_test "220-exec-next" \ | |
27 | "220\\^running(\r\n\\*running,thread-id=\"all\")?" \ | |
a7de96f0 | 28 | Index: gdb-7.4.50.20120703/gdb/testsuite/gdb.mi/mi2-console.exp |
3a58abaf | 29 | =================================================================== |
a7de96f0 PS |
30 | --- gdb-7.4.50.20120703.orig/gdb/testsuite/gdb.mi/mi2-console.exp 2012-07-03 20:26:25.060940765 +0200 |
31 | +++ gdb-7.4.50.20120703/gdb/testsuite/gdb.mi/mi2-console.exp 2012-07-03 20:26:32.809929858 +0200 | |
32 | @@ -46,6 +46,9 @@ if { [gdb_compile "${srcdir}/${subdir}/ | |
3a58abaf AM |
33 | |
34 | mi_run_to_main | |
35 | ||
36 | +# thread-id=\"all\" vs. thread-id=\"1\" below: | |
37 | +mi_gdb_test "210-gdb-set scheduler-locking off" "210\\^done" "set scheduler-locking off" | |
38 | + | |
39 | # Next over the hello() call which will produce lots of output | |
f412e1b4 PS |
40 | mi_gdb_test "220-exec-next" "220\\^running(\r\n)?(\\*running,thread-id=\"all\")?" \ |
41 | "Started step over hello" | |
a7de96f0 | 42 | Index: gdb-7.4.50.20120703/gdb/testsuite/gdb.mi/mi-cli.exp |
7566401a | 43 | =================================================================== |
a7de96f0 PS |
44 | --- gdb-7.4.50.20120703.orig/gdb/testsuite/gdb.mi/mi-cli.exp 2012-07-03 20:26:25.060940765 +0200 |
45 | +++ gdb-7.4.50.20120703/gdb/testsuite/gdb.mi/mi-cli.exp 2012-07-03 20:26:32.810929856 +0200 | |
46 | @@ -175,7 +175,7 @@ mi_execute_to "exec-continue" "breakpoin | |
7566401a ER |
47 | # Test that the token is output even for CLI commands |
48 | # Also test that *stopped includes frame information. | |
49 | mi_gdb_test "34 next" \ | |
50 | - ".*34\\\^running.*\\*running,thread-id=\"all\"" \ | |
51 | + ".*34\\\^running.*\\*running,thread-id=\"1\"" \ | |
52 | "34 next: run" | |
53 | ||
54 | if {!$async} { | |
a7de96f0 PS |
55 | Index: gdb-7.4.50.20120703/gdb/testsuite/gdb.mi/mi-logging.exp |
56 | =================================================================== | |
57 | --- gdb-7.4.50.20120703.orig/gdb/testsuite/gdb.mi/mi-logging.exp 2012-06-29 00:11:23.000000000 +0200 | |
58 | +++ gdb-7.4.50.20120703/gdb/testsuite/gdb.mi/mi-logging.exp 2012-07-03 20:29:03.573717651 +0200 | |
59 | @@ -56,7 +56,7 @@ close $chan | |
60 | ||
61 | set mi_log_prompt "\[(\]gdb\[)\] \[\r\n\]+" | |
62 | ||
63 | -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] { | |
64 | +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] { | |
65 | pass "Log file contents" | |
66 | } else { | |
67 | fail "Log file contents" | |
68 | @@ -79,7 +79,7 @@ set chan [open $milogfile] | |
69 | set logcontent [read $chan] | |
70 | close $chan | |
71 | ||
72 | -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] { | |
73 | +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] { | |
74 | pass "Redirect log file contents" | |
75 | } else { | |
76 | fail "Redirect log file contents" |