Merge GDB 7.5.1

gdb/testsuite/gdb.mi/mi-var-display.exp

 # Copyright 1999-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/>.
 
 # Test essential Machine interface (MI) operations
 #
 # Verify that, using the MI, we can create, update, delete variables.
 #
 
 
 load_lib mi-support.exp
 set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
     continue
 }
 
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-var-display
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
+standard_testfile var-cmd.c
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested mi-var-display.exp
     return -1
 }
 
 mi_delete_breakpoints
 mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load ${binfile}
 
 set line_dct_end [gdb_get_line_number "{int a = 0;}"]
 
@@ skipping 235 matching lines @@
 
 mi_gdb_test "-var-set-format weird.func_ptr hexadecimal" \
         "\\^done,format=\"hexadecimal\",value=\"$hex\"" \
         "set format variable weird.func_ptr"
 
 mi_gdb_test "-var-set-format weird.func_ptr_struct hexadecimal" \
         "\\^done,format=\"hexadecimal\",value=\"$hex\"" \
         "set format variable weird.func_ptr_struct"
 
 mi_gdb_test "-var-set-format weird.func_ptr_ptr natural" \
-        "\\^done,format=\"natural\",value=\"0\"" \
+        "\\^done,format=\"natural\",value=\"0x0\"" \
         "set format variable weird.func_ptr_ptr"
 
 mi_gdb_test "-var-set-format weird.u1 natural" \
         "\\^done,format=\"natural\",value=\"\{...\}\"" \
         "set format variable weird.u1"
 
 mi_gdb_test "-var-set-format weird.s2 natural" \
         "\\^done,format=\"natural\",value=\"\{...\}\"" \
         "set format variable weird.s2"
 
@@ skipping 307 matching lines @@
 }
 
 mi_continue_to "incr_a"
 
 # Test: c_variable-7.81
 # Desc: Create variables in different scopes
 mi_gdb_test "-var-create a1 * a" \
         "\\^done,name=\"a1\",numchild=\"0\",value=\".*\",type=\"char\".*" \
         "create local variable a1"
 
-mi_gdb_test "-var-create a2 $fp a" \
+if { [info exists fp] } {
+    mi_gdb_test "-var-create a2 $fp a" \
         "\\^done,name=\"a2\",numchild=\"0\",value=\".*\",type=\"int\".*" \
         "create variable a2 in different scope"
+} else {
+    untested "create variable a2 in different scope"
+}
 
 #gdbtk_test c_variable-7.81 {create variables in different scopes} {
 #  set a1 [gdb_variable create -expr a]
 #  set a2 [gdb_variable create -expr a -frame $fp]
 
 #  set vals {}
 #  lappend vals [$a1 value]
 #  lappend vals [$a2 value]
 #  set vals
 #} {2 1}
 
 
 mi_gdb_exit
 return 0