f61a679e8e
* Fix 16.0 handling. - Patches added: * gdb-testsuite-fix-gdb.python-py-format-string.exp-wi.patch * gdb-testsuite-fix-gdb.python-py-mi-cmd.exp-with-pyth.patch * gdb-testsuite-fix-gdb.ada-mi_task_arg.exp-on-arm-lin.patch * gdb-testsuite-fix-regexp-in-gdb.ada-mi_var_access.ex.patch * gdb-testsuite-check-gnatmake-version-in-gdb.ada-scal.patch * gdb-testsuite-fix-gdb.arch-arm-pseudo-unwind.exp-wit.patch * gdb-symtab-fix-target-type-of-complex-long-double-on.patch * gdb-testsuite-don-t-use-set-auto-solib-add-off.patch * gdb-tdep-fix-arm-thumb2-hw-breakpoint.patch * gdb-testsuite-fix-gdb.cp-m-static.exp-on-arm.patch * gdb-testsuite-fix-gdb.dwarf2-dw2-fixed-point.exp-on-.patch * gdb-testsuite-fix-gdb.dwarf2-dw2-lines.exp-on-arm-li.patch * gdb-exp-fix-gdb.fortran-intrinsics.exp-fail-on-arm.patch * gdb-tdep-handle-sycall-statx-for-arm-linux.patch * gdb-tdep-fix-recording-of-t1-push.patch * gdb-tdep-handle-syscall-clock_gettime64-for-arm-linu.patch * fix-gdb.dwarf2-shortpiece.exp-on-s390x.patch * handle-address-class-annotation-for-s390x-in-some-te.patch * fix-gdb.dap-step-out.exp-on-s390x.patch * use-setvariable-in-gdb.dap-scopes.exp.patch * fix-gdb.base-finish-pretty.exp-on-s390x.patch * fix-gdb.base-readnever.exp-on-s390x.patch * add-dwarf_expr_piece.op.patch * add-gdbarch_dwarf2_reg_piece_offset-hook.patch * fix-gdb.base-store.exp-on-s390x.patch * fix-gdb.ada-o2_float_param.exp-on-s390x-linux.patch * gdb-testsuite-fix-gdb.base-branch-to-self.exp-on-arm.patch * gdb-tdep-fix-gdb.cp-non-trivial-retval.exp-on-riscv6.patch * gdb-testsuite-fix-gdb.cp-non-trivial-retval.exp-on-a.patch * gdb-testsuite-fix-gdb.rust-completion.exp-timeout-on.patch * gdb-testsuite-require-supports_process_record-in-gdb.patch * gdb-testsuite-fix-regexp-in-gdb.arch-i386-disp-step-.patch * gdb-testsuite-fix-gdb.arch-arm-single-step-kernel-he.patch * gdb-testsuite-fix-gdb.python-py-format-address.exp-o.patch * gdb-testsuite-fix-gdb.arch-riscv-tdesc-regs.exp.patch * gdb-testsuite-fix-gdb.base-list-dot-nodebug-and-make.patch * gdb-testsuite-fix-gdb.base-list-dot-nodebug.exp-on-o.patch * gdb-testsuite-fix-gdb.base-empty-host-env-vars.exp.patch * gdb-prune-inferior-after-switching-inferior.patch * gdb-testsuite-use-nostdlib-in-gdb.base-list-dot-node.patch * gdb-testsuite-fix-timeout-in-gdb.mi-mi-multi-command.patch * gdb-testsuite-require-can_spawn_for_attach-in-gdb.ba.patch * fixup-gdb-6.5-gcore-buffer-limit-test.patch * gdb-testsuite-fix-gdb.ada-big_packed_array.exp-on-s3.patch * gdb-testsuite-fix-gdb.ada-convvar_comp.exp-on-s390x-.patch * gdb-testsuite-fix-regexp-in-gdb.threads-stepi-over-c.patch OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=437
72 lines
2.7 KiB
Diff
72 lines
2.7 KiB
Diff
From da8d1a26f1015678245f23abc0b96ee6fba9f16d Mon Sep 17 00:00:00 2001
|
|
From: Tom de Vries <tdevries@suse.de>
|
|
Date: Thu, 29 Aug 2024 07:31:12 +0200
|
|
Subject: [PATCH 32/46] [gdb/testsuite] Fix regexp in
|
|
gdb.arch/i386-disp-step-self-call.exp
|
|
|
|
Usually, with test-case gdb.arch/i386-disp-step-self-call.exp I get:
|
|
...
|
|
(gdb) x/1wx 0xffffc4f8^M
|
|
0xffffc4f8: 0x08048472^M
|
|
(gdb) PASS: $exp: check return address was updated correctly
|
|
...
|
|
but sometimes I run into:
|
|
...
|
|
(gdb) x/1wx 0xffffc5c8^M
|
|
0xffffc5c8: 0x0804917e^M
|
|
(gdb) FAIL: $exp: check return address was updated correctly
|
|
...
|
|
|
|
The problem is that here:
|
|
...
|
|
set next_insn_addr 0x[format %08X $next_insn_addr]
|
|
gdb_test "x/1wx 0x[format %x $sp]" "$hex:\\s+$next_insn_addr" \
|
|
"check return address was updated correctly"
|
|
...
|
|
we're trying to match string 0x0804917e against regexp 0x0804917E due to using
|
|
"%08X" as format string.
|
|
|
|
We only run into this problem if the address contains letters, which apparently
|
|
usually isn't the case.
|
|
|
|
Fix this by using "%08x" instead as format string.
|
|
|
|
Likewise in test-case gdb.arch/amd64-disp-step-self-call.exp.
|
|
|
|
Tested on x86_64-linux.
|
|
|
|
PR testsuite/32121
|
|
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32121
|
|
---
|
|
gdb/testsuite/gdb.arch/amd64-disp-step-self-call.exp | 2 +-
|
|
gdb/testsuite/gdb.arch/i386-disp-step-self-call.exp | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step-self-call.exp b/gdb/testsuite/gdb.arch/amd64-disp-step-self-call.exp
|
|
index 762d19a2960..2db3ff228c9 100644
|
|
--- a/gdb/testsuite/gdb.arch/amd64-disp-step-self-call.exp
|
|
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step-self-call.exp
|
|
@@ -77,6 +77,6 @@ gdb_assert {[expr $sp == $new_sp]} \
|
|
"check stack pointer was updated as expected"
|
|
|
|
# Check the contents of the stack were updated to the expected value.
|
|
-set next_insn_addr 0x[format %016X $next_insn_addr]
|
|
+set next_insn_addr 0x[format %016x $next_insn_addr]
|
|
gdb_test "x/1gx 0x[format %x $sp]" "$hex:\\s+$next_insn_addr" \
|
|
"check return address was updated correctly"
|
|
diff --git a/gdb/testsuite/gdb.arch/i386-disp-step-self-call.exp b/gdb/testsuite/gdb.arch/i386-disp-step-self-call.exp
|
|
index b2cb902f8ed..5de7ebcd69f 100644
|
|
--- a/gdb/testsuite/gdb.arch/i386-disp-step-self-call.exp
|
|
+++ b/gdb/testsuite/gdb.arch/i386-disp-step-self-call.exp
|
|
@@ -77,6 +77,6 @@ gdb_assert {[expr $sp == $new_sp]} \
|
|
"check stack pointer was updated as expected"
|
|
|
|
# Check the contents of the stack were updated to the expected value.
|
|
-set next_insn_addr 0x[format %08X $next_insn_addr]
|
|
+set next_insn_addr 0x[format %08x $next_insn_addr]
|
|
gdb_test "x/1wx 0x[format %x $sp]" "$hex:\\s+$next_insn_addr" \
|
|
"check return address was updated correctly"
|
|
--
|
|
2.43.0
|
|
|