aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorLuis Machado <luis.machado@linaro.org>2020-02-21 17:58:48 -0300
committerLuis Machado <luis.machado@linaro.org>2020-02-28 07:27:14 -0300
commit85d2d5bbee1c21c2e3e929cc68fe06d762b3073b (patch)
tree3189585bb399267ec717f96534381e391600dab0 /gdb
parentdec7b24be89fe0496f9442232bcbfcb16e030742 (diff)
downloadbinutils-85d2d5bbee1c21c2e3e929cc68fe06d762b3073b.zip
binutils-85d2d5bbee1c21c2e3e929cc68fe06d762b3073b.tar.gz
binutils-85d2d5bbee1c21c2e3e929cc68fe06d762b3073b.tar.bz2
Harden gdb.arch/aarch64-pauth.exp and fix a failure
When running this testcase against a QEMU with PAC support, i noticed we were failing to recognize the additional [PAC] that is emitted in the backtrace, resulting in this failure: FAIL: gdb.arch/aarch64-pauth.exp: backtrace I've made the test use multi_line to make the pattern more clear. Tested against aarch64-linux-gnu with and without PAC support. gdb/testsuite/ChangeLog: 2020-02-28 Luis Machado <luis.machado@linaro.org> * gdb.arch/aarch64-pauth.exp: Recognize optional PAC output.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.arch/aarch64-pauth.exp7
2 files changed, 10 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d5798bd..eb81976 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-28 Luis Machado <luis.machado@linaro.org>
+
+ * gdb.arch/aarch64-pauth.exp: Recognize optional PAC output.
+
2020-02-27 Tom de Vries <tdevries@suse.de>
* config/sid.exp: Remove unused globals.
diff --git a/gdb/testsuite/gdb.arch/aarch64-pauth.exp b/gdb/testsuite/gdb.arch/aarch64-pauth.exp
index 816e58b..264bfce 100644
--- a/gdb/testsuite/gdb.arch/aarch64-pauth.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-pauth.exp
@@ -40,4 +40,9 @@ gdb_breakpoint [ gdb_get_line_number "break here" ]
gdb_continue_to_breakpoint "break here" ".*break here.*"
# Ensure we can get a full backtrace, despite the address signing.
-gdb_test "bt" "^bt\r\n#0 +bar *\\(b=9\\) +at.*\r\n#1 +0x\[0-9a-f\]* +in +foo \\(a=5\\).*\r\n#2 +0x\[0-9a-f\]* +in +main \\(\\).*" "backtrace"
+gdb_test "bt" \
+ [multi_line \
+ "#0\[ \t\]+bar \\(b=9\\) at \[^\r\n\]+" \
+ "#1\[ \t\]+$hex (\\\[PAC\\\] )?in foo \\(a=5\\) at \[^\r\n\]+" \
+ "#2\[ \t\]+$hex (\\\[PAC\\\] )?in main \\(\\) at \[^\r\n\]+" ] \
+ "backtrace"