Tweak gdb.cp tests for aarch32

There are some gdb.cp/ tests fails if the program is compiled for arm
32-bit but GDB/GDBserver is aarch64 64-bit program, because target triplet
doesn't match "arm*-*-*".  Instead, we can use is_aarch32_target.

gdb/testsuite:

2016-08-01  Yao Qi  <yao.qi@linaro.org>

	* gdb.cp/anon-struct.exp: Check is_aarch32_target.
	* gdb.cp/cpexprs.exp: Likewise.
	* gdb.cp/m-static.exp: Likewise.
This commit is contained in:
Yao Qi 2016-08-01 09:18:02 +01:00
parent 5e3d6ca4de
commit e3465b24a2
4 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,9 @@
2016-08-01 Yao Qi <yao.qi@linaro.org>
* gdb.cp/anon-struct.exp: Check is_aarch32_target.
* gdb.cp/cpexprs.exp: Likewise.
* gdb.cp/m-static.exp: Likewise.
2016-07-26 Tom Tromey <tom@tromey.com>
PR python/20190:

View File

@ -20,7 +20,7 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] }
return -1
}
if { [istarget arm*-*-*] } {
if { [is_aarch32_target] } {
gdb_test "ptype t::t" "type = struct t {\r\n C m;\r\n} \\*\\(t \\* const\\)" \
"print type of t::t"
} else {
@ -31,7 +31,7 @@ if { [istarget arm*-*-*] } {
gdb_test "ptype X::t2" "type = struct X::t2 {\[\r\n \]*X::C2 m;\[\r\n \]*}" \
"print type of X::t2"
if { [istarget arm*-*-*] } {
if { [is_aarch32_target] } {
gdb_test "ptype X::t2::t2" "type = struct X::t2 {\r\n X::C2 m;\r\n} \\*\\(X::t2 \\* const\\)" \
"print type of X::t2::t2"
gdb_test "ptype t3::~t3" "type = void \\*\\(t3 \\* const\\)" \

View File

@ -144,7 +144,7 @@ add {base2::a_function} \
# On targets using the ARM EABI, the constructor is expected to return
# "this".
proc ctor_ret { type } {
if { [istarget arm*-*eabi*] } {
if { [istarget arm*-*eabi*] || [is_aarch32_target] } {
return "$type *"
} else {
return "void "
@ -195,7 +195,7 @@ add {base::base(int)} \
# GCC returns void * instead of $type *; RealView appears to do
# the same.
proc dtor { type } {
if { [istarget arm*-*eabi*] } {
if { [istarget arm*-*eabi*] || [is_aarch32_target] } {
set ret "void *"
} else {
set ret "void "

View File

@ -69,7 +69,7 @@ gdb_test "print test1.key2" "\\$\[0-9\]* = 77" "simple object, static long"
# simple object, static enum
gdb_test "print test1.value" "\\$\[0-9\]* = oriental" "simple object, static enum"
if { [istarget arm*-*-*] } {
if { [is_aarch32_target] } {
gdb_test "print test5.single_constructor" \
{ = {single_constructor \*\(single_constructor \* const\)} 0x[0-9a-f]+ <single_constructor::single_constructor\(\)>} \
"simple object instance, print constructor"