From b46551b20c9617e0cf2fda9a32b2132f3a7fd35c Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 8 Dec 2020 09:29:40 +0100 Subject: [PATCH] [gdb/testsuite] Simplify gdb.arch/amd64-gs_base.exp Redo fix committed in commit 67748e0f66 "[gdb/testsuite] Make gdb.arch/amd64-gs_base.exp unsupported for i386" using is_amd64_regs_target. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-12-08 Tom de Vries * gdb.arch/amd64-gs_base.exp: Undo commit 67748e0f66, reimplement using is_amd64_regs_target. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.arch/amd64-gs_base.exp | 28 ++---------------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2cf25a4311b..dcbb9b273b3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-12-08 Tom de Vries + + * gdb.arch/amd64-gs_base.exp: Undo commit 67748e0f66, reimplement + using is_amd64_regs_target. + 2020-12-08 Tom de Vries * gdb.ada/mi_task_arg.exp: Accept as valid value of diff --git a/gdb/testsuite/gdb.arch/amd64-gs_base.exp b/gdb/testsuite/gdb.arch/amd64-gs_base.exp index d29043bb796..a5cf98d2cc0 100644 --- a/gdb/testsuite/gdb.arch/amd64-gs_base.exp +++ b/gdb/testsuite/gdb.arch/amd64-gs_base.exp @@ -15,7 +15,7 @@ standard_testfile -if { ![istarget "x86_64-*linux*"] } then { +if { ![is_amd64_regs_target] } then { verbose "Untested x86_64 fs_base and gs_base tests." return } @@ -30,31 +30,6 @@ if ![runto_main] { return -1 } -# Test the presence of fs_base and gs_base on the system -# register group and values. -# -set ws "\[\t \]+" -set info_reg_out [multi_line "info register sys" \ - "fs_base${ws}$hex${ws}$decimal"\ - "gs_base${ws}$hex${ws}$decimal"\ - "orig_rax${ws}$hex${ws}\[-\]$decimal" ] -set info_reg_out_m32 [multi_line "info register sys" \ - "orig_eax${ws}$hex${ws}\[-\]$decimal" ] - -set supported 0 -gdb_test_multiple "info register sys" "" { - -re -wrap $info_reg_out { - set supported 1 - } - -re -wrap $info_reg_out_m32 { - } -} - -if { ! $supported } { - unsupported "target does not support fs_base and gs_base" - return -1 -} - gdb_test "print /x \$fs_base" "= $hex" "print fs_base" gdb_test "print /x \$gs_base" "= $hex" "print gs_base" @@ -64,6 +39,7 @@ gdb_test "print \$gs_base = 3" "= 3" "set gs_base" # Test the presence of fs_base and gs_base on the system # register group and values. # +set ws "\[\t \]+" set info_reg_out [multi_line "info register sys" \ "fs_base${ws}0x2${ws}2"\ "gs_base${ws}0x3${ws}3"\ -- 2.30.2