Index: gdb/testsuite/gdb.threads/non-ldr-exc-2.exp |
diff --git a/gdb/testsuite/gdb.threads/non-ldr-exc-2.exp b/gdb/testsuite/gdb.threads/non-ldr-exc-2.exp |
index 476e48e902f7c3911694194a6c84259bf2047b47..5b08fd1c6dcb3f8cd78e02c412284cdc2784147e 100644 |
--- a/gdb/testsuite/gdb.threads/non-ldr-exc-2.exp |
+++ b/gdb/testsuite/gdb.threads/non-ldr-exc-2.exp |
@@ -1,4 +1,4 @@ |
-# Copyright 2009-2012 Free Software Foundation, Inc. |
+# Copyright 2009-2013 Free Software Foundation, Inc. |
# This program is free software; you can redistribute it and/or modify |
# it under the terms of the GNU General Public License as published by |
@@ -29,33 +29,35 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab |
return -1 |
} |
-proc do_test { lock_sched } { with_test_prefix "lock-sched$lock_sched" { |
- global executable |
+proc do_test { lock_sched } { |
+ with_test_prefix "lock-sched$lock_sched" { |
+ global executable |
- clean_restart ${executable} |
+ clean_restart ${executable} |
- if ![runto_main] { |
- return -1 |
- } |
+ if ![runto_main] { |
+ return -1 |
+ } |
- gdb_breakpoint [gdb_get_line_number "break-here"] |
- gdb_continue_to_breakpoint "break-here" ".* break-here .*" |
+ gdb_breakpoint [gdb_get_line_number "break-here"] |
+ gdb_continue_to_breakpoint "break-here" ".* break-here .*" |
- gdb_test "info threads" \ |
- "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n\\* 2 *Thread \[^\r\n\]* at \[^\r\n\]*" \ |
- "single thread left" |
+ gdb_test "info threads" \ |
+ "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n\\* 2 *Thread \[^\r\n\]* at \[^\r\n\]*" \ |
+ "single thread left" |
- # Also test with sched-lock to make sure we can follow the |
- # non-leader thread execing even though the main thread wasn't |
- # resumed before the exec. |
- if { $lock_sched } { |
- gdb_test_no_output "set scheduler-locking on" |
- } |
+ # Also test with sched-lock to make sure we can follow the |
+ # non-leader thread execing even though the main thread wasn't |
+ # resumed before the exec. |
+ if { $lock_sched } { |
+ gdb_test_no_output "set scheduler-locking on" |
+ } |
- gdb_test "continue" \ |
- ".*is executing new program.*Breakpoint 1, main.* at .*" \ |
- "continue over exec" |
-}} |
+ gdb_test "continue" \ |
+ ".*is executing new program.*Breakpoint 1, main.* at .*" \ |
+ "continue over exec" |
+ } |
+} |
do_test 0 |
do_test 1 |