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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 22b3849de5d62582ff20af1fe9bf6f5432269c43..4c28dc171bdc1568afaca615a2133c475c3849da 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+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.
+
 2012-03-08  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        Fix CU relative vs. absolute DIE offsets.

diff --git a/gdb/testsuite/gdb.cp/mb-templates.exp b/gdb/testsuite/gdb.cp/mb-templates.exp
index e909543d363b6b468f21a091be56a96beb9ed4b7..d386c0290986602bb25f899674d3a2a4df9557ed 100644 (file)
--- 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
     }
 }