GDB 7.6.50

gdb/testsuite/gdb.base/charset.exp

Index: gdb/testsuite/gdb.base/charset.exp
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index 27e36d6dd060910da42556a66d5438eb397e8718..a5dbb2891eab184b295509bcb6578eefdbe51d0a 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -1,6 +1,6 @@
 # This testcase is part of GDB, the GNU debugger.
 
-# Copyright 2001, 2004, 2007-2012 Free Software Foundation, Inc.
+# Copyright 2001-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
@@ -21,10 +21,9 @@
 # Test GDB's character set support.
 
 
-set testfile "charset"
-set srcfile ${testfile}.c
-set srcmallocfile ${testfile}-malloc.c
-if { [prepare_for_testing ${testfile}.exp ${testfile} [list $srcfile $srcmallocfile]] } {
+standard_testfile .c charset-malloc.c
+
+if { [prepare_for_testing ${testfile}.exp ${testfile} [list $srcfile $srcfile2]] } {
     return -1
 }
 
@@ -578,7 +577,7 @@ if {$ucs2_ok && $ucs4_ok} {
 
 if {$ucs2_ok} {
     set go 1
-    gdb_test_multiple "python print 'hello, world!'" \
+    gdb_test_multiple "python print ('hello, world!')" \
 	"verify python support for charset tests" {
 	    -re "not supported.*$gdb_prompt $"	{
 		unsupported "python support is disabled"
@@ -591,7 +590,7 @@ if {$ucs2_ok} {
 	gdb_test "print u\"abcdef\"" " = u\"abcdef\"" \
 	    "set up for python printing of utf-16 string"
 
-	gdb_test "python print gdb.history(0).string()" "abcdef" \
+	gdb_test "python print (gdb.history(0).string())" "abcdef" \
 	    "extract utf-16 string using python"
     }
 }