5 files changed, 17 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a6e4714..1be9268 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-15  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.cp/casts.exp: Set print symbol off.
+	* gdb.cp/class2.exp: Likewise.
+	* gdb.cp/overload.exp: Likewise.
+	* gdb.cp/templates.exp: Likewise.
+
 2014-08-11  Doug Evans  <dje@google.com>
 
 	* gdb.base/print-symbol-loading.exp (test_load_core): Update.
diff --git a/gdb/testsuite/gdb.cp/casts.exp b/gdb/testsuite/gdb.cp/casts.exp
index 9122450..e28f311 100644
--- a/gdb/testsuite/gdb.cp/casts.exp
+++ b/gdb/testsuite/gdb.cp/casts.exp
@@ -42,6 +42,9 @@ if ![runto_main] then {
     continue
 }
 
+# Prevent symbol on address 0x0 being printed.
+gdb_test_no_output "set print symbol off"
+
 gdb_test "break [gdb_get_line_number "casts.exp: 1"]" \
     "Breakpoint.*at.* file .*" \
     ""
diff --git a/gdb/testsuite/gdb.cp/class2.exp b/gdb/testsuite/gdb.cp/class2.exp
index 82faac5..eae5922 100644
--- a/gdb/testsuite/gdb.cp/class2.exp
+++ b/gdb/testsuite/gdb.cp/class2.exp
@@ -28,9 +28,10 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1
 }
 
-# Start with "set print object off".
+# Start with "set print object off" and "set print symbol off".
 
 gdb_test_no_output "set print object off"
+gdb_test_no_output "set print symbol off"
 
 if ![runto_main] then {
     perror "couldn't run to main"
diff --git a/gdb/testsuite/gdb.cp/overload.exp b/gdb/testsuite/gdb.cp/overload.exp
index 73232f7..aea2efc 100644
--- a/gdb/testsuite/gdb.cp/overload.exp
+++ b/gdb/testsuite/gdb.cp/overload.exp
@@ -39,6 +39,9 @@ if ![runto 'marker1'] then {
     continue
 }
 
+# Prevent symbol on address 0x0 being printed.
+gdb_test_no_output "set print symbol off"
+
 gdb_test "up" ".*main.*" "up from marker1"
 
 # Print the monster class type.
diff --git a/gdb/testsuite/gdb.cp/templates.exp b/gdb/testsuite/gdb.cp/templates.exp
index 0cc0e84..42dc1df 100644
--- a/gdb/testsuite/gdb.cp/templates.exp
+++ b/gdb/testsuite/gdb.cp/templates.exp
@@ -293,6 +293,8 @@ gdb_test "c" \
 gdb_test "print fint" \
    "\\$\[0-9\]* = \\{x = 0, t = 0\\}"
 
+# Prevent symbol on address 0x0 being printed.
+gdb_test_no_output "set print symbol off"
 gdb_test "print fvpchar" \
     "\\$\[0-9\]* = \\{x = 0, t = 0x0\\}"