2013-09-20 Chung-Lin Tang <cltang@codesourcery.com>

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / pr11022.exp

diff --git a/gdb/testsuite/gdb.base/pr11022.exp b/gdb/testsuite/gdb.base/pr11022.exp
index 3f508eea8fbcdf141bf3b5310190baee7f0e1063..86d7f04915d39d04e12e04800d22effcced06611 100644 (file)
--- a/gdb/testsuite/gdb.base/pr11022.exp
+++ b/gdb/testsuite/gdb.base/pr11022.exp
@@ -1,5 +1,4 @@
-# Copyright 2009
-# 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
@@ -14,19 +13,12 @@
 # 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
+if {[skip_hw_watchpoint_tests]} {
+    return 0
 }
 
-if [target_info exists gdb,no_hardware_watchpoints] {
-    # This test requires HW watchpoints
-    untested pr11022.exp
-    return -1
-}
+standard_testfile .c
 
-set testfile "pr11022"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested pr11022.exp
      return -1
@@ -34,10 +26,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 
 # Start with a fresh gdb.
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 if ![runto_main] then {
     fail "Can't run to main"
@@ -53,6 +42,6 @@ gdb_test "continue" ".*break here.*" "breakpoint hit"
 gdb_test "continue" ".*Hardware watchpoint.*Old value = 0.*New value = 42.*" \
     "watchpoint hit"
 gdb_test "continue" ".*break here.*" "breakpoint hit 2"
-gdb_test "set var x = 1"
+gdb_test_no_output "set var x = 1"
 gdb_test "continue" ".*Hardware watchpoint.*Old value = 1.*New value = 42.*" \
     "watchpoint hit 2"