2012-02-21 Pedro Alves <palves@redhat.com>

	* gdb.trace/unavailable.exp (gdb_collect_globals_test): Use
	with_test_prefix.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2f184bf335467adcffab154ffe61d67eaade6fb1..cea203b8fc4fd20b20ffc1d3b65d3b941f7dab2f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-21  Pedro Alves  <palves@redhat.com>
+
+       * gdb.trace/unavailable.exp (gdb_collect_globals_test): Use
+       with_test_prefix.
+
 2012-02-21  Pedro Alves  <palves@redhat.com>
 
        * gdb.arch/altivec-abi.exp (altivec_abi_tests): Don't do

diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp
index 9130b4b74be9b99f8c77b70fc3db8e92bb2cc9e5..be79b8675d6bcd2361755002484408cccc5fd9aa 100644 (file)
--- a/gdb/testsuite/gdb.trace/unavailable.exp
+++ b/gdb/testsuite/gdb.trace/unavailable.exp
@@ -496,49 +496,43 @@ proc gdb_collect_globals_test { } { with_test_prefix "collect globals" {
 
     gdb_test_no_output "set print object on"
 
-    global pf_prefix
-    set old_pf_prefix $pf_prefix
-    append pf_prefix " print object on:"
-
-    # With print object on, printing a pointer may need to fetch the
-    # pointed-to object, to check its run-time type.  Make sure that
-    # fails gracefully and transparently when the pointer itself is
-    # unavailable.
-    gdb_test "print virtualp" " = \\(Virtual \\*\\) <unavailable>"
-
-    # no vtable pointer available
-    gdb_test "print derived_unavail" \
-       " = {<Middle> = <unavailable>, _vptr.Derived = <unavailable>, z = <unavailable>}"
-
-    # vtable pointer available, but nothing else
-    gdb_test "print derived_partial" \
-       " = \\(Derived\\) {<Middle> = {<Base> = <unavailable>, _vptr.Middle = <unavailable>, y = <unavailable>}, _vptr.Derived = $hex, z = <unavailable>}"
-
-    # whole object available
-    gdb_test "print derived_whole" \
-       " = \\(Derived\\) {<Middle> = {<Base> = {x = 2}, _vptr.Middle = $hex, y = 3}, _vptr.Derived = $hex, z = 4}"
-
-    set pf_prefix $old_pf_prefix
+    with_test_prefix "print object on" {
+       # With print object on, printing a pointer may need to fetch
+       # the pointed-to object, to check its run-time type.  Make
+       # sure that fails gracefully and transparently when the
+       # pointer itself is unavailable.
+       gdb_test "print virtualp" " = \\(Virtual \\*\\) <unavailable>"
+
+       # no vtable pointer available
+       gdb_test "print derived_unavail" \
+           " = {<Middle> = <unavailable>, _vptr.Derived = <unavailable>, z = <unavailable>}"
+
+       # vtable pointer available, but nothing else
+       gdb_test "print derived_partial" \
+           " = \\(Derived\\) {<Middle> = {<Base> = <unavailable>, _vptr.Middle = <unavailable>, y = <unavailable>}, _vptr.Derived = $hex, z = <unavailable>}"
+
+       # whole object available
+       gdb_test "print derived_whole" \
+           " = \\(Derived\\) {<Middle> = {<Base> = {x = 2}, _vptr.Middle = $hex, y = 3}, _vptr.Derived = $hex, z = 4}"
+    }
 
     gdb_test_no_output "set print object off"
 
-    append pf_prefix " print object off:"
-
-    gdb_test "print virtualp" " = \\(Virtual \\*\\) <unavailable>"
+    with_test_prefix "print object off" {
+       gdb_test "print virtualp" " = \\(Virtual \\*\\) <unavailable>"
 
-    # no vtable pointer available
-    gdb_test "print derived_unavail" \
-       " = {<Middle> = <unavailable>, _vptr.Derived = <unavailable>, z = <unavailable>}"
+       # no vtable pointer available
+       gdb_test "print derived_unavail" \
+           " = {<Middle> = <unavailable>, _vptr.Derived = <unavailable>, z = <unavailable>}"
 
-    # vtable pointer available, but nothing else
-    gdb_test "print derived_partial" \
-       " = {<Middle> = {<Base> = <unavailable>, _vptr.Middle = <unavailable>, y = <unavailable>}, _vptr.Derived = $hex, z = <unavailable>}"
+       # vtable pointer available, but nothing else
+       gdb_test "print derived_partial" \
+           " = {<Middle> = {<Base> = <unavailable>, _vptr.Middle = <unavailable>, y = <unavailable>}, _vptr.Derived = $hex, z = <unavailable>}"
 
-    # whole object available
-    gdb_test "print derived_whole" \
-       " = {<Middle> = {<Base> = {x = 2}, _vptr.Middle = $hex, y = 3}, _vptr.Derived = $hex, z = 4}"
-
-    set pf_prefix $old_pf_prefix
+       # whole object available
+       gdb_test "print derived_whole" \
+           " = {<Middle> = {<Base> = {x = 2}, _vptr.Middle = $hex, y = 3}, _vptr.Derived = $hex, z = 4}"
+    }
 
     # An instance of a virtual class where we collected everything but
     # the vptr.