From f3ad2025d78032c917c93d8eb38d88bbf4294408 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 27 Jan 2012 13:55:58 +0000 Subject: [PATCH] 2012-01-27 Pedro Alves * gdb.base/watchpoint.exp: Clean restart after tests that don't require `initialize' anymore. Remove unnecessary `initialize' calls. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/watchpoint.exp | 15 ++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ed36c8e..ad10adf 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2012-01-27 Pedro Alves + * gdb.base/watchpoint.exp: Clean restart after tests that don't + require `initialize' anymore. Remove unnecessary `initialize' + calls. + +2012-01-27 Pedro Alves + * gdb.base/watchpoint.exp (wp_set): Delete. (initialize, test_simple_watchpoint, top level): Remove dead code. diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index 16fe05f..9aeb5ec 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -781,17 +781,12 @@ if [initialize] then { if ![target_info exists gdb,cannot_call_functions] { test_stepping - - # See above. - if [istarget "mips-idt-*"] then { - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir - gdb_load $binfile - initialize - } } + # Tests below don't rely on the markers and watchpoint set by + # `initialize' anymore. + clean_restart $testfile + # Only enabled for some targets merely because it has not been tested # elsewhere. # On sparc-sun-sunos4.1.3, GDB was running all the way to the marker4 @@ -806,7 +801,6 @@ if [initialize] then { gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load $binfile - initialize } # Only enabled for some targets merely because it has not been tested @@ -852,7 +846,6 @@ if [initialize] then { gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load $binfile - initialize } test_watchpoint_and_breakpoint -- 2.7.4