Merge GDB 7.5.1

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

 # Copyright 1999-2002, 2004-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
@@ skipping 10 matching lines @@
 
 
 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-cmd
-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-cmd.exp
     return -1
 }
 
 mi_delete_breakpoints
 mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load ${binfile}
 
 
 #####                   #####
@@ skipping 325 matching lines @@
 # and does not incorrectly make the value as changed.
 mi_gdb_test "-var-assign func do_block_tests" \
         "\\^done,value=\"$hex <do_block_tests>\"" \
         "assign same value to func"
 
 mi_gdb_test "-var-update *" \
         "\\^done,changelist=\\\[\\\]" \
         "assign same value to func (update)"
 
 mi_gdb_test "-var-create array_ptr * array_ptr" \
-        "\\^done,name=\"array_ptr\",numchild=\"1\",value=\"$hex\",type=\"int \\*\",has_more=\"0\"" \
+        "\\^done,name=\"array_ptr\",numchild=\"1\",value=\"$hex <array>\",type=\"int \\*\",has_more=\"0\"" \
         "create global variable array_ptr"
 
 mi_gdb_test "-var-assign array_ptr array2" \
-        "\\^done,value=\"$hex\"" \
+        "\\^done,value=\"$hex <array2>\"" \
         "assign array to pointer"
 
 mi_gdb_test "-var-update *" \
         "\\^done,changelist=\\\[\{name=\"array_ptr\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
         "assign array to pointer (update)"
 
 mi_gdb_test "-var-assign array_ptr array2" \
-        "\\^done,value=\"$hex\"" \
+        "\\^done,value=\"$hex <array2>\"" \
         "assign same array to pointer"
 
 mi_gdb_test "-var-update *" \
         "\\^done,changelist=\\\[\\\]" \
         "assign same array to pointer (update)"
 
 
 ######
 # End of assign tests 
 #####
@@ skipping 255 matching lines @@
 mi_gdb_test "-var-update L" \
     {\^done,changelist=\[{name="L",in_scope="true",type_changed="false",has_more="0"}\]} \
     "in-and-out-of-scope: in scope now"
 
 mi_gdb_test "-var-update L" \
     {\^done,changelist=\[\]} \
     "in-and-out-of-scope: in scope now, not changed"
 
 mi_gdb_exit
 return 0