From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 676913858D33 for ; Tue, 28 Feb 2023 12:32:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 676913858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de 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 9D4C821A12 for ; Tue, 28 Feb 2023 12:32:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1677587559; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=KfLBtyDF20ZYKdeqXiUFFrxXNPBxeSbb9oASFn/cAew=; b=eN565SNAEjRZ6hwRk6WpMHdrerQVdZtUYcaCFgt9ovrAHdy5qbLyEsC0lBrkj+jV0+IcD2 Bna8TPL4sQ6Rz2U9VpnvnafP5c3kLxKP5coJaLuutPJ2bQ9gRXQKb40jtaijV/BayvvuxQ 8438atpZSzCaQik9o8DwN6mHGYsPwRk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1677587559; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=KfLBtyDF20ZYKdeqXiUFFrxXNPBxeSbb9oASFn/cAew=; b=5JxlitQB5/QqwgTiQz2WnIsZCvJ2c04akuOtTSUK6ts3rob5AYASzUoSCGMs7A3sPOvqid 5CNi/mkpZW6Y9dCw== 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 7FA641333C for ; Tue, 28 Feb 2023 12:32:39 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 2OAnHWf0/WOeEQAAMHmgww (envelope-from ) for ; Tue, 28 Feb 2023 12:32:39 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Fix gdb.rust/watch.exp on ppc64le Date: Tue, 28 Feb 2023 13:32:48 +0100 Message-Id: <20230228123248.14376-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On x86_64-linux, I have: ... (gdb) watch -location y^M Hardware watchpoint 2: -location y^M (gdb) PASS: gdb.rust/watch.exp: watch -location y ... but on powerpc64le-linux, I run into: ... (gdb) watch -location y^M Watchpoint 2: -location y^M (gdb) FAIL: gdb.rust/watch.exp: watch -location y ... due to the regexp matching "Hardware watchpoint" but not "Watchpoint": ... gdb_test "watch -location y" ".*watchpoint .* -location .*" ... Fix this by making the regexp less restrictive. Tested on x86_64-linux and powerpc64le-linux. --- gdb/testsuite/gdb.rust/watch.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.rust/watch.exp b/gdb/testsuite/gdb.rust/watch.exp index 83cb41cc1eb..43c88f8a1fc 100644 --- a/gdb/testsuite/gdb.rust/watch.exp +++ b/gdb/testsuite/gdb.rust/watch.exp @@ -30,4 +30,4 @@ if {![runto ${srcfile}:$line]} { } # Just setting a watchpoint was enough to trigger the bug. -gdb_test "watch -location y" ".*watchpoint .* -location .*" +gdb_test "watch -location y" ".*\[wW\]atchpoint .* -location .*" base-commit: 2968b79fca38cf18e8eef360c36de7a6e3846d3c -- 2.35.3