Merge GDB 7.5.1

gdb/testsuite/gdb.trace/unavailable.exp

 # Copyright 1998, 2005, 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/>.
 
 load_lib "trace-support.exp"
 
-set testfile "unavailable"
-set srcfile ${testfile}.cc
+standard_testfile unavailable.cc
 set executable $testfile
-set binfile $objdir/$subdir/$executable
 
-if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-        executable {debug nowarnings c++}] != "" } {
-    untested unavailable.exp
+if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+         {debug nowarnings c++}]} {
     return -1
 }
 
 set ws "\[\r\n\t \]+"
 set cr "\[\r\n\]+"
 
 if [is_amd64_regs_target] {
     set fpreg "rbp"
     set spreg "rsp"
     set pcreg "rip"
@@ skipping 93 matching lines @@
         "" \
         "delete $var display" \
         ".*Delete all auto-display expressions.*y or n. $" \
         "y"
 }
 
 #
 # Test procs
 #
 
-proc gdb_collect_args_test {} {
+proc gdb_collect_args_test {} { with_test_prefix "unavailable arguments" {
     global cr
     global gdb_prompt
-    global pf_prefix
-
-    set old_pf_prefix $pf_prefix
-    set pf_prefix "$pf_prefix unavailable arguments:"
 
     prepare_for_trace_test
 
     gdb_test "trace args_test_func" \
         "Tracepoint \[0-9\]+ at .*" \
         "set tracepoint"
 
     # Begin the test.
     run_trace_experiment args_test_func
 
@@ skipping 42 matching lines @@
     set r "${r}argd = <unavailable>${cr}"
     set r "${r}argstruct = {memberc = <unavailable>, memberi = <unavailable>, memberf = <unavailable>, memberd = <unavailable>}${cr}"
     set r "${r}argarray = <unavailable>${cr}"
     gdb_test "info args" "$r" "info args"
 
     test_maybe_regvar_display "argc"
 
     gdb_test "tfind none" \
         "#0  end .*" \
         "cease trace debugging"
+}}
 
-    set pf_prefix $old_pf_prefix
-}
-
-proc gdb_collect_locals_test { func msg } {
+proc gdb_collect_locals_test { func msg } { with_test_prefix "unavailable locals: $msg" {
     global cr
     global gdb_prompt
-    global pf_prefix
-
-    set old_pf_prefix $pf_prefix
-    set pf_prefix "$pf_prefix unavailable locals: $msg:"
 
     prepare_for_trace_test
 
     set testline [gdb_get_line_number "set $func tracepoint here"]
 
     gdb_test "trace $testline" \
             "Tracepoint \[0-9\]+ at .*" \
             "set tracepoint"
 
     # Begin the test.
@@ skipping 26 matching lines @@
     }
     set r "${r}locc = <unavailable>${cr}"
     set r "${r}loci = <unavailable>${cr}"
     gdb_test "info locals" "$r" "info locals"
 
     test_maybe_regvar_display "loci"
 
     gdb_test "tfind none" \
         "#0  end .*" \
         "cease trace debugging"
+}}
 
-    set pf_prefix $old_pf_prefix
-}
-
-proc gdb_unavailable_registers_test { } {
+proc gdb_unavailable_registers_test { } { with_test_prefix "unavailable registers" {
     global gdb_prompt
     global spreg
     global pcreg
-    global pf_prefix
-
-    set old_pf_prefix $pf_prefix
-    set pf_prefix "$pf_prefix unavailable registers:"
 
     prepare_for_trace_test
 
     # We'll simply re-use the globals_test_function for this test
     gdb_test "trace globals_test_func" \
             "Tracepoint \[0-9\]+ at .*" \
             "set tracepoint"
 
     # Collect nothing.
 
@@ skipping 25 matching lines @@
 
     gdb_test "info registers" \
         "\\*value not available\\*.*\\*value not available\\*" \
         "info registers, multiple registers not available"
 
     gdb_test "info registers \$$spreg" \
         "\\*value not available\\*" \
         "info registers \$$spreg reports not available"
 
     gdb_test "tfind none" "#0  end .*" "cease trace debugging"
+}}
 
-    set pf_prefix $old_pf_prefix
+proc gdb_unavailable_floats { } {
+    global gdb_prompt
+
+    with_test_prefix "unavailable floats" {
+        prepare_for_trace_test
+
+        # We'll simply re-use the globals_test_function for this test
+        gdb_test "trace globals_test_func" \
+            "Tracepoint \[0-9\]+ at .*" \
+            "set tracepoint"
+
+        # Collect nothing.
+
+        # Begin the test.
+        run_trace_experiment globals_test_func
+
+        # Necessarily target specific.
+        if {[istarget "x86_64-*-*"] || [istarget i?86-*]} {
+            send_gdb "info float\n"
+            gdb_expect_list "info float" ".*$gdb_prompt $" {
+                "Status Word:         <unavailable>"
+                "Control Word:        <unavailable>"
+                "Tag Word:            <unavailable>"
+                "Instruction Pointer: <unavailable>:<unavailable>"
+                "Operand Pointer:     <unavailable>:<unavailable>"
+                "Opcode:              <unavailable>"
+            }
+        }
+
+        gdb_test "tfind none" "#0  end .*" "cease trace debugging"
+    }
 }
 
-proc gdb_collect_globals_test { } {
+proc gdb_collect_globals_test { } { with_test_prefix "collect globals" {
     global ws
     global cr
     global gdb_prompt
     global hex
-    global pf_prefix
-
-    set old_pf_prefix $pf_prefix
-    set pf_prefix "$pf_prefix collect globals:"
 
     prepare_for_trace_test
 
     set testline [gdb_get_line_number "set globals_test_func tracepoint here"]
 
     gdb_test "trace $testline" \
             "Tracepoint \[0-9\]+ at .*" \
             "set tracepoint"
 
     # We collect the initial sizeof(pointer) bytes of derived_partial
@@ skipping 112 matching lines @@
         " = {d = <unavailable>, ref = <unavailable>}"
 
     # Strings
 
     # Const string is always available, even when not collected.
     gdb_test "print g_const_string" \
         " = \"hello world\"$cr" \
         "non collected const string is still printable"
 
     gdb_test "print g_string_p" \
-        " = $hex \"hello world\"" \
+        " = $hex <g_const_string> \"hello world\"" \
         "printing constant string through collected pointer"
 
     gdb_test "print g_string_unavail" \
         " = \{<unavailable> <repeats 12 times>\}" \
         "printing non collected string"
 
     # Incomplete strings print as an array.
     gdb_test "print g_string_partial" \
         "\\$\[0-9\]+ = \{<unavailable>, 101 'e', 108 'l', <unavailable>, <unavailable>, <unavailable>, <unavailable>, <unavailable>, <unavailable>, <unavailable>, <unavailable>, <unavailable>\}" \
         "printing partially collected string"
@@ skipping 33 matching lines @@
 
     # Cast to baseclass, checking the unavailable-ness is propagated.
     gdb_test "print (small_struct) g_smallstruct_b" " = \\{member = <unavailable>\\}"
 
     # Same cast, but starting from a non-lazy, value.
     gdb_test "print g_smallstruct_b" " = \\{<small_struct> = \\{member = <unavailable>\\}, <No data fields>\\}"
     gdb_test "print (small_struct) \$" " = \\{member = <unavailable>\\}"
 
     gdb_test_no_output "set print object on"
 
-    set old_pf_prefix_2 $pf_prefix
-    set pf_prefix "$pf_prefix print object on:"
+    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>"
 
-    # 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>}"
 
-    # 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 <vtable for Derived.*>, 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_2
+        # whole object available
+        gdb_test "print derived_whole" \
+            " = \\(Derived\\) {<Middle> = {<Base> = {x = 2}, _vptr.Middle = $hex, y = 3}, _vptr.Derived = $hex <vtable for Derived.*>, z = 4}"
+    }
 
     gdb_test_no_output "set print object off"
 
-    set pf_prefix "$pf_prefix print object off:"
+    with_test_prefix "print object off" {
+        gdb_test "print virtualp" " = \\(Virtual \\*\\) <unavailable>"
 
-    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 <vtable for Derived.*>, 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_2
+        # whole object available
+        gdb_test "print derived_whole" \
+            " = {<Middle> = {<Base> = {x = 2}, _vptr.Middle = $hex, y = 3}, _vptr.Derived = $hex <vtable for Derived.*>, z = 4}"
+    }
 
     # An instance of a virtual class where we collected everything but
     # the vptr.
     gdb_test "print virtual_partial" \
         " = {_vptr.Virtual = <unavailable>, z = 0}"
 
     gdb_test "tfind none" \
         "#0  end .*" \
         "cease trace debugging"
-
-    set pf_prefix $old_pf_prefix
-}
+}}
 
 proc gdb_trace_collection_test {} {
     gdb_collect_globals_test
     gdb_unavailable_registers_test
+    gdb_unavailable_floats
 
     gdb_collect_args_test
     gdb_collect_locals_test local_test_func "auto locals"
     gdb_collect_locals_test reglocal_test_func "register locals"
     gdb_collect_locals_test statlocal_test_func "static locals"
 }
 
-clean_restart $executable
 runto_main
 
-# We generously give ourselves one "pass" if we successfully
-# detect that this test cannot be run on this target!
 if { ![gdb_target_supports_trace] } then {
-    pass "Current target does not support trace"
+    unsupported "Current target does not support trace"
     return 1;
 }
 
 # Body of test encased in a proc so we can return prematurely.
 gdb_trace_collection_test
 
 # Finished!
 gdb_test "tfind none" ".*" ""