From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id AEToMP+PUWGTOwAAWB0awg (envelope-from ) for ; Mon, 27 Sep 2021 05:33:51 -0400 Received: by simark.ca (Postfix, from userid 112) id B697D1EE25; Mon, 27 Sep 2021 05:33:51 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.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 8455F1EDDB for ; Mon, 27 Sep 2021 05:33:50 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2E8863858439 for ; Mon, 27 Sep 2021 09:33:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E8863858439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1632735230; bh=Rvu6TLxIeGh2h4xhXKgl9TWRLunWyB99K6VAbY4BcBk=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=TUreni/HTq286u5ZZX0Novs3eYJrccSjSL+4FSl6YQLZP21CNlGW5cZFqF0HU6KBp L8zGgi/ROlJYn8E0n8jDfLr/fubnukyeFkwCwZWyfjTHgEqvA5Wi0RVohLEJ/5Y9sS VOHBF8jTk7TXegC06Lfk8IL6lGJ3mODicbmEQB9w= Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 6CA0A3858C3A for ; Mon, 27 Sep 2021 09:33:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6CA0A3858C3A 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 A92E422101 for ; Mon, 27 Sep 2021 09:33:31 +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 7B34B13C94 for ; Mon, 27 Sep 2021 09:33:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id xgGyGuuPUWGDdQAAMHmgww (envelope-from ) for ; Mon, 27 Sep 2021 09:33:31 +0000 Date: Mon, 27 Sep 2021 11:33:29 +0200 To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix gdb.base/dcache-flush.exp Message-ID: <20210927093328.GA26342@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.base/dcache-flush.exp on ubuntu 18.04.5, I run into: ... (gdb) PASS: gdb.base/dcache-flush.exp: p var2 info dcache^M Dcache 4096 lines of 64 bytes each.^M Contains data for Thread 0x7ffff7fc6b80 (LWP 3551)^M Line 0: address 0x7fffffffd4c0 [47 hits]^M Line 1: address 0x7fffffffd500 [31 hits]^M Line 2: address 0x7fffffffd5c0 [7 hits]^M Cache state: 3 active lines, 85 hits^M (gdb) FAIL: gdb.base/dcache-flush.exp: check dcache before flushing ... The regexp expects "Contains data for process $decimal". This is another case of thread_db_target::pid_to_str being used. Fix this by updating the regexp. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix gdb.base/dcache-flush.exp --- gdb/testsuite/gdb.base/dcache-flush.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.base/dcache-flush.exp b/gdb/testsuite/gdb.base/dcache-flush.exp index 4ac10b9fab1..ff59b2bb7ae 100644 --- a/gdb/testsuite/gdb.base/dcache-flush.exp +++ b/gdb/testsuite/gdb.base/dcache-flush.exp @@ -34,7 +34,7 @@ gdb_test "p var2" " = 3" gdb_test "info dcache" \ [multi_line \ "Dcache $decimal lines of $decimal bytes each." \ - "Contains data for process $decimal" \ + "Contains data for (process $decimal|Thread \[^\r\n\]*)" \ "Line 0: address $hex \[$decimal hits\].*" \ "Cache state: $decimal active lines, $decimal hits" ] \ "check dcache before flushing" @@ -58,7 +58,7 @@ with_test_prefix "refilling" { gdb_test "info dcache" \ [multi_line \ "Dcache $decimal lines of $decimal bytes each." \ - "Contains data for process $decimal" \ + "Contains data for (process $decimal|Thread \[^\r\n\]*)" \ "Line 0: address $hex \[$decimal hits\].*" \ "Cache state: $decimal active lines, $decimal hits" ] \ "check dcache before refilling"