GDB 7.6.50

gdb/testsuite/gdb.base/dump.exp

Index: gdb/testsuite/gdb.base/dump.exp
diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp
index 44cccbf5292680b79445759d4edd037d43bb5107..ccdf82bd7cafb6635dc92c55c2341cd9841fcb8f 100644
--- a/gdb/testsuite/gdb.base/dump.exp
+++ b/gdb/testsuite/gdb.base/dump.exp
@@ -1,4 +1,4 @@
-# Copyright 2002, 2004, 2007-2012 Free Software Foundation, Inc.
+# Copyright 2002-2013 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
@@ -17,10 +17,8 @@
 # This is a test for the gdb command "dump".
 
 
-set testfile "dump"
+standard_testfile
 
-set srcfile  ${testfile}.c
-set binfile  ${objdir}/${subdir}/${testfile}
 set options  {debug}
 
 set is64bitonly "no"
@@ -32,10 +30,6 @@ if [istarget "alpha*-*-*"] then {
     lappend options "additional_flags=-Wl,-taso"
 }
 
-if {[istarget "ia64*-*-*"] || [istarget "hppa64-*-*"]} then {
-    set is64bitonly "yes"
-}
-
 if {[istarget "spu*-*-*"]} then {
     # The internal address format used for the combined Cell/B.E.
     # debugger requires 64-bit.
@@ -58,9 +52,39 @@ gdb_test "dump mem /dev/null 0x10 0x20" "Cannot access memory at address 0x10" \
 
 gdb_load ${binfile}
 
+# Check the address of a variable.  If it is bigger than 32-bit,
+# assume our target has 64-bit addresses that are not supported by SREC,
+# IHEX and TEKHEX.  We skip those tests then.
+set max_32bit_address "0xffffffff"
+set data_address [get_hexadecimal_valueof "&intarray" 0x100000000]
+if {${data_address} > ${max_32bit_address}} then {
+    set is64bitonly "yes"
+}
+
 # Clean up any stale output files from previous test runs
 
-remote_exec build "rm -f intarr1.bin intarr1b.bin intarr1.ihex intarr1.srec intarr1.tekhex intarr2.bin intarr2b.bin intarr2.ihex intarr2.srec intarr2.tekhex intstr1.bin intstr1b.bin intstr1.ihex intstr1.srec intstr1.tekhex intstr2.bin intstr2b.bin intstr2.ihex intstr2.srec intstr2.tekhex intarr3.srec"
+set filenames {}
+set all_files {
+    intarr1.bin intarr1b.bin intarr1.ihex
+    intarr1.srec intarr1.tekhex intarr2.bin intarr2b.bin intarr2.ihex
+    intarr2.srec intarr2.tekhex intstr1.bin intstr1b.bin intstr1.ihex
+    intstr1.srec intstr1.tekhex intstr2.bin intstr2b.bin intstr2.ihex
+    intstr2.srec intstr2.tekhex intarr3.srec
+}
+
+# This loop sets variables dynamically -- each name listed in
+# $ALL_FILES is both a file name and a variable name.
+foreach file $all_files {
+    if {[is_remote host]} {
+	set this_name $file
+    } else {
+	set this_name [standard_output_file $file]
+    }
+
+    lappend filenames [set ${file} $this_name]
+}
+
+remote_exec host "rm -f $filenames"
 
 # Test help (FIXME:)
 
@@ -93,34 +117,34 @@ proc make_dump_file { command msg } {
     }
 }
 
-make_dump_file "dump val intarr1.bin intarray" \
+make_dump_file "dump val [set intarr1.bin] intarray" \
 	"dump array as value, default"
 
-make_dump_file "dump val intstr1.bin intstruct" \
+make_dump_file "dump val [set intstr1.bin] intstruct" \
 	"dump struct as value, default"
 
-make_dump_file "dump bin val intarr1b.bin intarray" \
+make_dump_file "dump bin val [set intarr1b.bin] intarray" \
 	"dump array as value, binary"
 
-make_dump_file "dump bin val intstr1b.bin intstruct" \
+make_dump_file "dump bin val [set intstr1b.bin] intstruct" \
 	"dump struct as value, binary"
 
-make_dump_file "dump srec val intarr1.srec intarray" \
+make_dump_file "dump srec val [set intarr1.srec] intarray" \
 	"dump array as value, srec"
 
-make_dump_file "dump srec val intstr1.srec intstruct" \
+make_dump_file "dump srec val [set intstr1.srec] intstruct" \
 	"dump struct as value, srec"
 
-make_dump_file "dump ihex val intarr1.ihex intarray" \
+make_dump_file "dump ihex val [set intarr1.ihex] intarray" \
 	"dump array as value, intel hex"
 
-make_dump_file "dump ihex val intstr1.ihex intstruct" \
+make_dump_file "dump ihex val [set intstr1.ihex] intstruct" \
 	"dump struct as value, intel hex"
 
-make_dump_file "dump tekhex val intarr1.tekhex intarray" \
+make_dump_file "dump tekhex val [set intarr1.tekhex] intarray" \
 	"dump array as value, tekhex"
 
-make_dump_file "dump tekhex val intstr1.tekhex intstruct" \
+make_dump_file "dump tekhex val [set intstr1.tekhex] intstruct" \
 	"dump struct as value, tekhex"
 
 proc capture_value { expression args } {
@@ -129,8 +153,9 @@ proc capture_value { expression args } {
 
     set output_string ""
     if {[llength $args] > 0} {
-	# Convert $args into a simple string.
-	set test "[join $args]; capture $expression"
+	# Convert $args into a simple string and don't use EXPRESSION
+	# in the test name.
+	set test "[join $args]; capture"
     } {
 	set test "capture $expression"
     }
@@ -187,39 +212,39 @@ set struct_val   [capture_value "intstruct"]
 set array_ptr_type [capture_pointer_with_type "&intarray"]
 set struct_ptr_type [capture_pointer_with_type "&intstruct"]
 
-make_dump_file "dump mem intarr2.bin $array_start $array_end" \
+make_dump_file "dump mem [set intarr2.bin] $array_start $array_end" \
 	"dump array as memory, default"
 
-make_dump_file "dump  mem intstr2.bin $struct_start $struct_end" \
+make_dump_file "dump  mem [set intstr2.bin] $struct_start $struct_end" \
 	"dump struct as memory, default"
 
-make_dump_file "dump bin mem intarr2b.bin $array_start $array_end" \
+make_dump_file "dump bin mem [set intarr2b.bin] $array_start $array_end" \
 	"dump array as memory, binary"
 
-make_dump_file "dump bin mem intstr2b.bin $struct_start $struct_end" \
+make_dump_file "dump bin mem [set intstr2b.bin] $struct_start $struct_end" \
 	"dump struct as memory, binary"
 
-make_dump_file "dump srec mem intarr2.srec $array_start $array_end" \
+make_dump_file "dump srec mem [set intarr2.srec] $array_start $array_end" \
 	"dump array as memory, srec"
 
-make_dump_file "dump srec mem intstr2.srec $struct_start $struct_end" \
+make_dump_file "dump srec mem [set intstr2.srec] $struct_start $struct_end" \
 	"dump struct as memory, srec"
 
-make_dump_file "dump ihex mem intarr2.ihex $array_start $array_end" \
+make_dump_file "dump ihex mem [set intarr2.ihex] $array_start $array_end" \
 	"dump array as memory, ihex"
 
-make_dump_file "dump ihex mem intstr2.ihex $struct_start $struct_end" \
+make_dump_file "dump ihex mem [set intstr2.ihex] $struct_start $struct_end" \
 	"dump struct as memory, ihex"
 
-make_dump_file "dump tekhex mem intarr2.tekhex $array_start $array_end" \
+make_dump_file "dump tekhex mem [set intarr2.tekhex] $array_start $array_end" \
 	"dump array as memory, tekhex"
 
-make_dump_file "dump tekhex mem intstr2.tekhex $struct_start $struct_end" \
+make_dump_file "dump tekhex mem [set intstr2.tekhex] $struct_start $struct_end" \
 	"dump struct as memory, tekhex"
 
 # test complex expressions
 make_dump_file \
-	"dump srec mem intarr3.srec &intarray \(char *\) &intarray + sizeof intarray" \
+    "dump srec mem [set intarr3.srec] &intarray \(char *\) &intarray + sizeof intarray" \
 	"dump array as mem, srec, expressions"
 
 proc test_restore_saved_value { restore_args msg oldval newval } {
@@ -240,70 +265,70 @@ if ![string compare $is64bitonly "no"] then {
 
   gdb_test "print zero_all ()" ".*"
 
-  test_restore_saved_value "intarr1.srec" "array as value, srec" \
+  test_restore_saved_value "[set intarr1.srec]" "array as value, srec" \
 	$array_val "intarray"
 
-  test_restore_saved_value "intstr1.srec" "struct as value, srec" \
+  test_restore_saved_value "[set intstr1.srec]" "struct as value, srec" \
 	$struct_val "intstruct"
 
   gdb_test "print zero_all ()" "void" "zero all"
 
-  test_restore_saved_value "intarr2.srec" "array as memory, srec" \
+  test_restore_saved_value "[set intarr2.srec]" "array as memory, srec" \
 	$array_val "intarray"
 
-  test_restore_saved_value "intstr2.srec" "struct as memory, srec" \
+  test_restore_saved_value "[set intstr2.srec]" "struct as memory, srec" \
 	$struct_val "intstruct"
 
   gdb_test "print zero_all ()" ".*"
 
-  test_restore_saved_value "intarr1.ihex" "array as value, ihex" \
+  test_restore_saved_value "[set intarr1.ihex]" "array as value, ihex" \
 	$array_val "intarray"
 
-  test_restore_saved_value "intstr1.ihex" "struct as value, ihex" \
+  test_restore_saved_value "[set intstr1.ihex]" "struct as value, ihex" \
 	$struct_val "intstruct"
 
   gdb_test "print zero_all ()" ".*"
 
-  test_restore_saved_value "intarr2.ihex" "array as memory, ihex" \
+  test_restore_saved_value "[set intarr2.ihex]" "array as memory, ihex" \
 	$array_val "intarray"
 
-  test_restore_saved_value "intstr2.ihex" "struct as memory, ihex" \
+  test_restore_saved_value "[set intstr2.ihex]" "struct as memory, ihex" \
 	$struct_val "intstruct"
 
   gdb_test "print zero_all ()" ".*"
 
-  test_restore_saved_value "intarr1.tekhex" "array as value, tekhex" \
+  test_restore_saved_value "[set intarr1.tekhex]" "array as value, tekhex" \
 	$array_val "intarray"
 
-  test_restore_saved_value "intstr1.tekhex" "struct as value, tekhex" \
+  test_restore_saved_value "[set intstr1.tekhex]" "struct as value, tekhex" \
 	$struct_val "intstruct"
 
   gdb_test "print zero_all ()" ".*"
 
-  test_restore_saved_value "intarr2.tekhex" "array as memory, tekhex" \
+  test_restore_saved_value "[set intarr2.tekhex]" "array as memory, tekhex" \
 	$array_val "intarray"
 
-  test_restore_saved_value "intstr2.tekhex" "struct as memory, tekhex" \
+  test_restore_saved_value "[set intstr2.tekhex]" "struct as memory, tekhex" \
 	$struct_val "intstruct"
 }
 
 gdb_test "print zero_all ()" ".*"
 
-test_restore_saved_value "intarr1.bin binary $array_start" \
+test_restore_saved_value "[set intarr1.bin] binary $array_start" \
 	"array as value, binary" \
 	$array_val "intarray"
 
-test_restore_saved_value "intstr1.bin binary $struct_start" \
+test_restore_saved_value "[set intstr1.bin] binary $struct_start" \
 	"struct as value, binary" \
 	$struct_val "intstruct"
 
 gdb_test "print zero_all ()" ".*"
 
-test_restore_saved_value "intarr2.bin binary $array_start" \
+test_restore_saved_value "[set intarr2.bin] binary $array_start" \
 	"array as memory, binary" \
 	$array_val "intarray"
 
-test_restore_saved_value "intstr2.bin binary $struct_start" \
+test_restore_saved_value "[set intstr2.bin] binary $struct_start" \
 	"struct as memory, binary" \
 	$struct_val "intstruct"
 
@@ -320,42 +345,42 @@ gdb_test "print zero_all ()" ".*"
 
 
 if ![string compare $is64bitonly "no"] then {
-  test_restore_saved_value "intarr1.srec $array2_offset" \
+  test_restore_saved_value "[set intarr1.srec] $array2_offset" \
 	"array copy, srec" \
 	$array_val "intarray2"
 
-  test_restore_saved_value "intstr1.srec $struct2_offset" \
+  test_restore_saved_value "[set intstr1.srec] $struct2_offset" \
 	"struct copy, srec" \
 	$struct_val "intstruct2"
 
   gdb_test "print zero_all ()" ".*"
 
-  test_restore_saved_value "intarr1.ihex $array2_offset" \
+  test_restore_saved_value "[set intarr1.ihex] $array2_offset" \
 	"array copy, ihex" \
 	$array_val "intarray2"
 
-  test_restore_saved_value "intstr1.ihex $struct2_offset" \
+  test_restore_saved_value "[set intstr1.ihex] $struct2_offset" \
 	"struct copy, ihex" \
 	$struct_val "intstruct2"
 
   gdb_test "print zero_all ()" ".*"
 
-  test_restore_saved_value "intarr1.tekhex $array2_offset" \
+  test_restore_saved_value "[set intarr1.tekhex] $array2_offset" \
 	"array copy, tekhex" \
 	$array_val "intarray2"
 
-  test_restore_saved_value "intstr1.tekhex $struct2_offset" \
+  test_restore_saved_value "[set intstr1.tekhex] $struct2_offset" \
 	"struct copy, tekhex" \
 	$struct_val "intstruct2"
 }
 
 gdb_test "print zero_all ()" ".*"
 
-test_restore_saved_value "intarr1.bin binary $array2_start" \
+test_restore_saved_value "[set intarr1.bin] binary $array2_start" \
 	"array copy, binary" \
 	$array_val "intarray2"
 
-test_restore_saved_value "intstr1.bin binary $struct2_start" \
+test_restore_saved_value "[set intstr1.bin] binary $struct2_start" \
 	"struct copy, binary" \
 	$struct_val "intstruct2"
 
@@ -378,7 +403,7 @@ set element4_offset \
 if ![string compare $is64bitonly "no"] then {
   gdb_test "print zero_all ()" ".*"
 
-  test_restore_saved_value "intarr1.srec 0 $element3_start $element4_start" \
+  test_restore_saved_value "[set intarr1.srec] 0 $element3_start $element4_start" \
 	"array partial, srec" 4 "intarray\[3\]"
 
   gdb_test "print intarray\[2\] == 0" " = 1" "element 2 not changed - 1"
@@ -386,7 +411,7 @@ if ![string compare $is64bitonly "no"] then {
 
   gdb_test "print zero_all ()" ".*"
 
-  test_restore_saved_value "intarr1.ihex 0 $element3_start $element4_start" \
+  test_restore_saved_value "[set intarr1.ihex] 0 $element3_start $element4_start" \
 	"array partial, ihex" 4 "intarray\[3\]"
 
   gdb_test "print intarray\[2\] == 0" " = 1" "element 2 not changed - 2"
@@ -394,7 +419,7 @@ if ![string compare $is64bitonly "no"] then {
 
   gdb_test "print zero_all ()" ".*"
 
-  test_restore_saved_value "intarr1.tekhex 0 $element3_start $element4_start" \
+  test_restore_saved_value "[set intarr1.tekhex] 0 $element3_start $element4_start" \
 	"array partial, tekhex" 4 "intarray\[3\]"
 
   gdb_test "print intarray\[2\] == 0" " = 1" "element 2 not changed - 3"
@@ -404,7 +429,7 @@ if ![string compare $is64bitonly "no"] then {
 gdb_test "print zero_all ()" ".*"
 
 test_restore_saved_value \
-    "intarr1.bin binary $array_start $element3_offset $element4_offset" \
+    "[set intarr1.bin] binary $array_start $element3_offset $element4_offset" \
     "array partial, binary" 4 "intarray\[3\]"
 
 gdb_test "print intarray\[2\] == 0" " = 1" "element 2 not changed - 4"
@@ -415,7 +440,7 @@ if ![string compare $is64bitonly "no"] then {
 
   # restore with expressions 
   test_restore_saved_value \
-	"intarr3.srec (char*)${array2_start}-(char*)${array_start} &intarray\[3\] &intarray\[4\]" \
+	"[set intarr3.srec] (char*)${array2_start}-(char*)${array_start} &intarray\[3\] &intarray\[4\]" \
 	"array partial with expressions" 4 "intarray2\[3\]"
 
   gdb_test "print intarray2\[2\] == 0" " = 1" "element 2 not changed, == 4"
@@ -440,14 +465,14 @@ gdb_test_multiple "set endian $endian" "set endianness" {
 # Reload saved values one by one, and compare.
 
 if { ![string compare $array_val \
-	   [capture_value "intarray" "file binfile"]] } then {
+	   [capture_value "intarray" "file binfile; intarray"]] } then {
     fail "start with intarray un-initialized"
 } else {
     pass "start with intarray un-initialized"
 }
 
 if { ![string compare $struct_val \
-	   [capture_value "intstruct" "file binfile"]] } then {
+	   [capture_value "intstruct" "file binfile; intstruct"]] } then {
     fail "start with intstruct un-initialized"
 } else {
     pass "start with intstruct un-initialized"
@@ -467,41 +492,49 @@ proc test_reload_saved_value { filename msg oldval newval } {
 
 # srec format can not be loaded for 64-bit-only platforms
 if ![string compare $is64bitonly "no"] then {
-  test_reload_saved_value "intarr1.srec" "reload array as value, srec" \
+  test_reload_saved_value "[set intarr1.srec]" "reload array as value, srec" \
 	$array_val "\*$array_ptr_type"
-  test_reload_saved_value "intstr1.srec" "reload struct as value, srec" \
+  test_reload_saved_value "[set intstr1.srec]" "reload struct as value, srec" \
 	$struct_val "\*$struct_ptr_type"
-  test_reload_saved_value "intarr2.srec" "reload array as memory, srec" \
+  test_reload_saved_value "[set intarr2.srec]" "reload array as memory, srec" \
 	$array_val "\*$array_ptr_type"
-  test_reload_saved_value "intstr2.srec" "reload struct as memory, srec" \
+  test_reload_saved_value "[set intstr2.srec]" "reload struct as memory, srec" \
 	$struct_val "\*$struct_ptr_type"
 }
 
 # ihex format can not be loaded for 64-bit-only platforms
 if ![string compare $is64bitonly "no"] then {
 
-  test_reload_saved_value "intarr1.ihex" "reload array as value, intel hex" \
+  test_reload_saved_value "[set intarr1.ihex]" \
+      "reload array as value, intel hex" \
 	$array_val "\*$array_ptr_type"
-  test_reload_saved_value "intstr1.ihex" "reload struct as value, intel hex" \
+  test_reload_saved_value "[set intstr1.ihex]" \
+      "reload struct as value, intel hex" \
 	$struct_val "\*$struct_ptr_type"
-  test_reload_saved_value "intarr2.ihex" "reload array as memory, intel hex" \
+  test_reload_saved_value "[set intarr2.ihex]" \
+      "reload array as memory, intel hex" \
 	$array_val "\*$array_ptr_type"
-  test_reload_saved_value "intstr2.ihex" "reload struct as memory, intel hex" \
+  test_reload_saved_value "[set intstr2.ihex]" \
+      "reload struct as memory, intel hex" \
 	$struct_val "\*$struct_ptr_type"
 }
 
 # tekhex format can not be loaded for 64-bit-only platforms
 if ![string compare $is64bitonly "no"] then {
-  test_reload_saved_value "intarr1.tekhex" "reload array as value, tekhex" \
+  test_reload_saved_value "[set intarr1.tekhex]" \
+      "reload array as value, tekhex" \
 	$array_val "\*$array_ptr_type"
-  test_reload_saved_value "intstr1.tekhex" "reload struct as value, tekhex" \
+  test_reload_saved_value "[set intstr1.tekhex]" \
+      "reload struct as value, tekhex" \
 	$struct_val "\*$struct_ptr_type"
-  test_reload_saved_value "intarr2.tekhex" "reload array as memory, tekhex" \
+  test_reload_saved_value "[set intarr2.tekhex]" \
+      "reload array as memory, tekhex" \
 	$array_val "\*$array_ptr_type"
-  test_reload_saved_value "intstr2.tekhex" "reload struct as memory, tekhex" \
+  test_reload_saved_value "[set intstr2.tekhex]" \
+      "reload struct as memory, tekhex" \
 	$struct_val "\*$struct_ptr_type"
 }
 
 # clean up files
 
-remote_exec build "rm -f intarr1.bin intarr1b.bin intarr1.ihex intarr1.srec intarr1.tekhex intarr2.bin intarr2b.bin intarr2.ihex intarr2.srec intarr2.tekhex intstr1.bin intstr1b.bin intstr1.ihex intstr1.srec intstr1.tekhex intstr2.bin intstr2b.bin intstr2.ihex intstr2.srec intstr2.tekhex intarr3.srec"
+remote_exec host "rm -f $filenames"