Merge GDB 7.5.1

gdb/testsuite/gdb.cp/formatted-ref.exp

 # Copyright 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/>.
 
 # Author: P. N. Hilfinger, AdaCore, Inc.
 
 # This test checks the behavior of formatted print when applied to a 
 # reference value.  The intended behavior is that a formatted print of
 # such a value should display the same value as a plain print, 
 # modulo format, of course.  Older versions of GDB would instead print
 # the reference's address value itself when doing a formatted print,
 # rather than printing both that and the dereferenced value.  We also
 # check that the (non-standard) expression &(&x), where x is of type T&,
 # yields an appropriate value.
 # This also tests that some other arithmetic operations on references
 # work properly: condition expression using a reference object as one of its
 # operand.
 
-if $tracelevel then {
-        strace $tracelevel
-}
-
 
 if { [skip_cplus_tests] } { continue }
 
-set testfile "formatted-ref"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     untested formatted-ref.exp
-     return -1
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+    return -1
 }
 
 proc get_address { var } {
     global expect_out
     global gdb_prompt
 
     gdb_test_multiple "print &$var" "find address of $var" {
         -re "\\$\[0-9\]+ = \\(.*\\) (0x\[0-9a-f\]+).*$gdb_prompt $" {
             return $expect_out(1,string)
         }
@@ skipping 56 matching lines @@
         }
     }
     return 0
 }
 
 proc test_p_op1_equals_op2 {op1 op2} {
     set test "print $op1 == $op2"
     gdb_test $test "\\$\[0-9\]+ = true"
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 runto ${srcfile}:[gdb_get_line_number "marker here"]
 
 set s1_address  [get_address "s1"]
 set e1_address  [get_address "e1"]
 set i1_address  [get_address "i1"]
 
 test_p_x "s" "Struct1 &" "{x = 0xd, y = 0x13}" $s1_address
 test_p_x "e" "Enum1 &" "0xb" $e1_address
 test_p_x "i" "int &" "0x17" $i1_address
 
 test_p_x_addr "s" $s1_address
 test_p_x_addr "e" $e1_address
 test_p_x_addr "i" $i1_address
 
 test_p_x_ref_addr "s" $s1_address
 test_p_x_ref_addr "i" $i1_address
 test_p_x_ref_addr "e" $e1_address
 
 test_p_op1_equals_op2 "s.x" "13"