Merge branch 'binutils' into tmp

[pf3gnuchains/pf3gnuchains4x.git] / gdb / testsuite / gdb.base / pr11022.exp

diff --git a/gdb/testsuite/gdb.base/pr11022.exp b/gdb/testsuite/gdb.base/pr11022.exp
index c5356c8..c11857d 100644 (file)
--- a/gdb/testsuite/gdb.base/pr11022.exp
+++ b/gdb/testsuite/gdb.base/pr11022.exp
@@ -1,4 +1,4 @@
-# Copyright 2009, 2010 Free Software Foundation, Inc.
+# Copyright 2009-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
@@ -13,14 +13,8 @@
 # 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 [target_info exists gdb,no_hardware_watchpoints] {
-    # This test requires HW watchpoints
-    untested pr11022.exp
-    return -1
+if {[skip_hw_watchpoint_tests]} {
+    return 0
 }
 
 set testfile "pr11022"
@@ -52,6 +46,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"