public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Tom de Vries <vries@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] [gdb/testsuite] Fix have_mpx test
Date: Thu, 16 Jun 2022 13:11:30 +0000 (GMT)	[thread overview]
Message-ID: <20220616131130.1E8723835688@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=f0d49de4be0ba22457f19c96ec2cfa787da5b507

commit f0d49de4be0ba22457f19c96ec2cfa787da5b507
Author: Tom de Vries <tdevries@suse.de>
Date:   Thu Jun 16 15:11:26 2022 +0200

    [gdb/testsuite] Fix have_mpx test
    
    When testing on openSUSE Leap 15.4 I ran into this FAIL:
    ...
    FAIL: gdb.arch/i386-mpx-map.exp: NULL address of the pointer
    ...
    and likewise for all the other mpx tests.
    
    The problem is that have_mpx is supposed to return 0, but it doesn't because
    it tries to match this output:
    ...
    builtin_spawn -ignore SIGHUP temp/20294/have_mpx-2-20294.x^M
    No MPX support^M
    No MPX support^M
    ...
    using:
    ...
                       && ![string equal $output "No MPX support\r\n"]]
    ...
    
    Fix this by matching using a regexp instead.
    
    Tested on x86_64-linux.

Diff:
---
 gdb/testsuite/lib/gdb.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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


                 reply	other threads:[~2022-06-16 13:11 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220616131130.1E8723835688@sourceware.org \
    --to=vries@sourceware.org \
    --cc=gdb-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).