From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id TQhTAjsRSWESHAAAWB0awg (envelope-from ) for ; Mon, 20 Sep 2021 18:54:51 -0400 Received: by simark.ca (Postfix, from userid 112) id EA0871EE25; Mon, 20 Sep 2021 18:54:50 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 59C0C1EDF7 for ; Mon, 20 Sep 2021 18:54:50 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EC87C3858425 for ; Mon, 20 Sep 2021 22:54:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC87C3858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1632178490; bh=4+slAnV55/1COpblSPSV2GMYr9GGb64EdL2V1zSlIX8=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=H5P2zBeAe7FYQZQX1q9RMP9lI2wNx6WevAznTHNukLuDl2tH61CEdGV+/4iblBWRs wUXwPMN4AJRDIK8gjeeQGzo59w9WuML14efzk2tpG7OiKw4ZEJKX09t3bWKZiSl2IT lJK2pvhRCGMyjEWIknuD7P1LP1zfHhSnj8H69H4c= Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 5C6FC3858D3C for ; Mon, 20 Sep 2021 22:54:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5C6FC3858D3C Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 984E721E4A for ; Mon, 20 Sep 2021 22:54:30 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 80CC213B35 for ; Mon, 20 Sep 2021 22:54:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Jn/+HSYRSWHJXQAAMHmgww (envelope-from ) for ; Mon, 20 Sep 2021 22:54:30 +0000 Date: Tue, 21 Sep 2021 00:54:28 +0200 To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix gdb.ada/interface.exp with gcc-9 Message-ID: <20210920225427.GA30543@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Tom de Vries via Gdb-patches Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Hi, When running test-case gdb.ada/interface.exp with gcc-9, we run into: ... (gdb) info locals^M s = (x => 1, y => 2, w => 3, h => 4)^M r = (x => 1, y => 2, w => 3, h => 4)^M (gdb) FAIL: gdb.ada/interface.exp: info locals ... The failure is caused by the regexp expecting variable r followed by variable s. Fix this by allowing variable s followed by variable r as well. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix gdb.ada/interface.exp with gcc-9 --- gdb/testsuite/gdb.ada/interface.exp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/gdb.ada/interface.exp b/gdb/testsuite/gdb.ada/interface.exp index 2dfcd8e8afd..9795699fd5a 100644 --- a/gdb/testsuite/gdb.ada/interface.exp +++ b/gdb/testsuite/gdb.ada/interface.exp @@ -34,9 +34,9 @@ gdb_test "print r" \ gdb_test "print s" \ "= \\(x => 1, y => 2, w => 3, h => 4\\)" +set r_re "r = \[^\r\n\]*" +set s_re "s = \[^\r\n\]*" set cmd "info locals" -gdb_test $cmd \ - [multi_line \ - $cmd \ - "r = \[^\r\n\]*" \ - "s = \[^\r\n\]*"] +set re1 [multi_line $cmd $r_re $s_re] +set re2 [multi_line $cmd $s_re $r_re] +gdb_test $cmd "(?:$re1|$re2)"