From: Tom de Vries <tdevries@suse.de>
Date: Fri, 7 Oct 2022 14:17:35 +0000 (+0200)
Subject: [gdb/testsuite] Fix have_mpx with remote-gdbserver-on-localhost
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=43792b0de4e1f9cbd7f38c00f7150df66b8bddea;p=binutils-gdb.git

[gdb/testsuite] Fix have_mpx with remote-gdbserver-on-localhost

With target board remote-gdbserver-on-localhost and gdb.arch/i386-mpx-call.exp
I run into:
...
FAIL: gdb.arch/i386-mpx-call.exp: upper_bnd0: continue to a bnd violation
...

This is due to the have_mpx test which should return 0, but instead returns 1
because the captured output:
...
No MPX support
No MPX support
...
does not match the used regexp:
...
    set status [expr ($status == 0) \
                   && ![regexp "^No MPX support\r\n" $output]]
...
which does match the captured output with native:
...
No MPX support^M
No MPX support^M
...

Fix this by making the \r in the regexp optional.

Tested on x86_64-linux, with native and target board
remote-gdbserver-on-localhost.
---

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index d60dceffd3f..99a6de6f724 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -8636,7 +8636,7 @@ gdb_caching_proc have_mpx {
     set status [lindex $result 0]
     set output [lindex $result 1]
     set status [expr ($status == 0) \
-		    && ![regexp "^No MPX support\r\n" $output]]
+		    && ![regexp "^No MPX support\r?\n" $output]]
 
     remote_file build delete $obj