Merge GDB 7.5.1

gdb/testsuite/gdb.base/ena-dis-br.exp

 # This testcase is part of GDB, the GNU debugger.
 
 # Copyright 1997-1999, 2003-2004, 2007-2012 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
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
-global usestubs
-
 #
 # test running programs
 #
 
 set testfile "break"
 set srcfile ${testfile}.c
 set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
@@ skipping 10 matching lines @@
      untested ena-dis-br.exp
      return -1
 }
 
 gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
+set bp_location7 [gdb_get_line_number "set breakpoint 7 here"]
 set bp_location8 [gdb_get_line_number "set breakpoint 8 here" $srcfile1]
 set bp_location9 [gdb_get_line_number "set breakpoint 9 here" $srcfile1]
 set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
 set bp_location13 [gdb_get_line_number "set breakpoint 13 here" $srcfile1]
 set bp_location14 [gdb_get_line_number "set breakpoint 14 here" $srcfile1]
 set bp_location15 [gdb_get_line_number "set breakpoint 15 here" $srcfile1]
 set bp_location16 [gdb_get_line_number "set breakpoint 16 here" $srcfile1]
 set bp_location17 [gdb_get_line_number "set breakpoint 17 here" $srcfile1]
 set bp_location18 [gdb_get_line_number "set breakpoint 18 here" $srcfile1]
 
@@ skipping 96 matching lines @@
 # already proven that disabled bp's don't trigger).
 
 set bp [break_at "marker4" " line ($bp_location14|$bp_location13).*"]
 
 gdb_test_no_output "disable $bp" "disable break marker4"
 
 gdb_test "info break $bp" \
     "\[0-9\]*\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+n.*" \
     "info break marker4"
 
+if ![runto_main] then {
+    fail "enable/disable break tests suppressed"
+}
+
+# Test enable count by stopping at a location until it is disabled
+# and passes through.
+
+set bp [break_at $bp_location7 "line $bp_location7"]
+
+set bp2 [break_at marker1 " line ($bp_location15|$bp_location16)"]
+
+gdb_test_no_output "enable count 2 $bp" "disable break with count"
+
+gdb_test "continue" \
+    ".*factorial .*:$bp_location7.*" \
+    "continue from enable count, first time"
+
+gdb_test "continue" \
+    ".*factorial .*:$bp_location7.*" \
+    "continue from enable count, second time"
+
+gdb_test "continue" \
+    ".*marker1 .*:($bp_location15|$bp_location16).*" \
+    "continue through enable count, now disabled"
+
 # Verify that we can set a breakpoint with an ignore count N, which
 # should cause the next N triggers of the bp to be ignored.  (This is
 # a flavor of enablement/disablement, after all.)
 
 if ![runto_main] then {
     fail "enable/disable break tests suppressed"
 }
 
 set bp [break_at "marker1" " line ($bp_location15|$bp_location16).*"]
 
@@ skipping 114 matching lines @@
     -re "Not stopped at any breakpoint; argument ignored.*$gdb_prompt $" {
         pass "$test"
     }
     -re "No breakpoint number -1.*$gdb_prompt $" {
         kfail gdb/1689 "$test"
     }
 }
 
 gdb_exit
 return 0