Merge GDB 7.5.1

gdb/testsuite/gdb.base/charset.exp

 # This testcase is part of GDB, the GNU debugger.
 
 # Copyright 2001, 2004, 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/>.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-gdb@gnu.org
 
 # Test GDB's character set support.
 
-if $tracelevel then {
-        strace $tracelevel
-}
-
 
 set testfile "charset"
 set srcfile ${testfile}.c
 set srcmallocfile ${testfile}-malloc.c
 if { [prepare_for_testing ${testfile}.exp ${testfile} [list $srcfile $srcmallocfile]] } {
     return -1
 }
 
 # Parse the output from a `show charset' command.  Return the host
 # and target charset as a two-element list.
@@ skipping 564 matching lines @@
 }
 
 # Regression test for a cleanup bug in the charset code.
 gdb_test "print 'a' == 'a' || 'b' == 'b'" \
   ".* = 1" \
   "EVAL_SKIP cleanup handling regression test"
 
 
 proc string_display { var_name set_prefix x_size x_type} {
   gdb_test_no_output "set ${var_name} = ${set_prefix}\"Test String\\0with zeroes\"" "Assign ${var_name} with prefix ${set_prefix}"
-  gdb_test "x /2${x_size}s ${var_name}" ".* ${x_type}\"Test String\"\[\r\n\]+.* ${x_type}\"with zeroes\"" "Display String ${var_name} with x/${x_size}s"
+  gdb_test "x /2${x_size}s ${var_name}" ".*\t${x_type}\"Test String\"\[\r\n\]+.*\t${x_type}\"with zeroes\"" "Display String ${var_name} with x/${x_size}s"
 }
 
 if {$ucs2_ok} {
     string_display String16 u h u
     if {$wchar_size == 2} {
         string_display String16 L h u
     }
 }
 
 string_display String32 U w U
 if {$wchar_size == 4} {
   string_display String32 L w U
 }
 
 
 foreach name {short int long} {
     # We're really just checking to make sure this doesn't give an
     # error.
     gdb_test "print ${name}_array = \"hi\"" \
         " = {.*}" \
         "assign string to $name array"
 }
 
 
 gdb_exit