aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite/gdb.cp/mb-templates.exp
diff options
context:
space:
mode:
authorLuis Machado <luisgpm@br.ibm.com>2012-03-08 21:09:17 +0000
committerLuis Machado <luisgpm@br.ibm.com>2012-03-08 21:09:17 +0000
commitd6b6bbb74438122e1e1e472179bd5e73f69c04e0 (patch)
treee340d26356899f184c260e4f58951d649ba1d20f /gdb/testsuite/gdb.cp/mb-templates.exp
parent52323be946ffc98caecb4c76ec0801e424b913ae (diff)
downloadgdb-d6b6bbb74438122e1e1e472179bd5e73f69c04e0.zip
gdb-d6b6bbb74438122e1e1e472179bd5e73f69c04e0.tar.gz
gdb-d6b6bbb74438122e1e1e472179bd5e73f69c04e0.tar.bz2
2012-03-08 Luis Machado <lgustavo@codesourcery.com>
Revert: 2012-03-03 Jan Kratochvil <jan.kratochvil@redhat.com> Implement testsuite workaround for PR breakpoints/13781. * gdb.cp/mb-templates.exp: New loop with variable $workaround. (set breakpoint condition-evaluation host): New conditional command.
Diffstat (limited to 'gdb/testsuite/gdb.cp/mb-templates.exp')
-rw-r--r--gdb/testsuite/gdb.cp/mb-templates.exp37
1 files changed, 13 insertions, 24 deletions
diff --git a/gdb/testsuite/gdb.cp/mb-templates.exp b/gdb/testsuite/gdb.cp/mb-templates.exp
index e909543..d386c02 100644
--- a/gdb/testsuite/gdb.cp/mb-templates.exp
+++ b/gdb/testsuite/gdb.cp/mb-templates.exp
@@ -38,35 +38,24 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
return -1
}
-# If GDB crashes try it again workarounding PR breakpoints/13781.
+clean_restart ${executable}
-foreach workaround [list "" " (workaround)"] {
- clean_restart ${executable}
+set bp_location [gdb_get_line_number "set breakpoint here"]
- if {${workaround} != ""} {
- gdb_test_no_output "set breakpoint condition-evaluation host"
- }
-
- set bp_location [gdb_get_line_number "set breakpoint here"]
+# Set a breakpoint with multiple locations
+# and a condition.
- # Set a breakpoint with multiple locations
- # and a condition.
-
- gdb_test "break $srcfile:$bp_location if i==1" \
- "Breakpoint.*at.*: $srcfile:$bp_location. \\(2 locations\\).*" \
- "initial condition: set breakpoint$workaround"
+gdb_test "break $srcfile:$bp_location if i==1" \
+ "Breakpoint.*at.*: $srcfile:$bp_location. \\(2 locations\\).*" \
+ "initial condition: set breakpoint"
- gdb_run_cmd
+gdb_run_cmd
- if {${workaround} == "" && [is_remote target]} {
- setup_kfail breakpoints/13781 "*-*-*"
- }
- set test "initial condition: run to breakpoint$workaround"
- gdb_test_multiple "" $test {
- -re "Breakpoint \[0-9\]+,.*foo<int> \\(i=1\\).*$gdb_prompt $" {
- pass $test
- break
- }
+set test "initial condition: run to breakpoint"
+gdb_test_multiple "" $test {
+ -re "Breakpoint \[0-9\]+,.*foo<int> \\(i=1\\).*$gdb_prompt $" {
+ pass $test
+ break
}
}