From 775e0f048171cae1cbe0d8bfb230204142e06834 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Thu, 14 Aug 2014 10:51:10 +0800 Subject: [PATCH] Set print symbol off in some tests GDB in default prints the symbol associated on an address, and tests assume that there is no symbol on address zero. However, on bare metal target, address may be mapped to zero and there may be a symbol. Then, some tests fail as below: print const_cast (0)^M $8 = (void *) 0x0 <_ftext>^M (gdb) FAIL: gdb.cp/casts.exp: const_cast of 0 p acp->c1^M $9 = (A *) 0x0 <_ftext>^M (gdb) FAIL: gdb.cp/class2.exp: p acp->c1 This patch is to set print symbol off in these tests, like what I did previously https://sourceware.org/ml/gdb-patches/2014-07/msg00257.html gdb/testsuite: 2014-08-15 Yao Qi * gdb.cp/casts.exp: Set print symbol off. * gdb.cp/class2.exp: Likewise. * gdb.cp/overload.exp: Likewise. * gdb.cp/templates.exp: Likewise. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.cp/casts.exp | 3 +++ gdb/testsuite/gdb.cp/class2.exp | 3 ++- gdb/testsuite/gdb.cp/overload.exp | 3 +++ gdb/testsuite/gdb.cp/templates.exp | 2 ++ 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a6e47148eae..1be926854d7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2014-08-15 Yao Qi + + * 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 * 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 912245032b9..e28f311008e 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 82faac5be0a..eae59223812 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 73232f74bfe..aea2efc8994 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 0cc0e841c6c..42dc1dfca3b 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\\}" -- 2.30.2