Merge GDB 7.5.1

gdb/testsuite/gdb.ada/info_locals_renaming.exp

Index: gdb/testsuite/gdb.ada/info_locals_renaming.exp
diff --git a/gdb/testsuite/gdb.ada/char_enum.exp b/gdb/testsuite/gdb.ada/info_locals_renaming.exp
similarity index 79%
copy from gdb/testsuite/gdb.ada/char_enum.exp
copy to gdb/testsuite/gdb.ada/info_locals_renaming.exp
index 4115ff31be7eeb10917697f23a3e3e890ed0d96f..a8c646997d3cd2957fc9c4b174d158bbed76c182 100644
--- a/gdb/testsuite/gdb.ada/char_enum.exp
+++ b/gdb/testsuite/gdb.ada/info_locals_renaming.exp
@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Free Software Foundation, Inc.
+# Copyright 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
@@ -15,14 +15,16 @@
 
 load_lib "ada.exp"
 
-set testdir "char_enum"
+if { [skip_ada_tests] } { return -1 }
+
+set testdir "info_locals_renaming"
 set testfile "${testdir}/foo"
 set srcfile ${srcdir}/${subdir}/${testfile}.adb
 set binfile ${objdir}/${subdir}/${testfile}
 
 file mkdir ${objdir}/${subdir}/${testdir}
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
+    return -1
 }
 
 clean_restart ${testfile}
@@ -30,6 +32,5 @@ clean_restart ${testfile}
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"
 
-gdb_test "print Char_Enum_Type'('B')" "= 1 'B'"
-
+gdb_test "info locals" "gv = 1"