From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id A76883858D39 for ; Wed, 15 Mar 2023 15:38:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A76883858D39 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 8882C219CF for ; Wed, 15 Mar 2023 15:38:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678894718; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JHp/ABLKHtL5E8hN9YfgFTDRgWekarOX9gzYpju4Ars=; b=x4qlDty/3xCi3eDHdXWxzoehITK/sgIhWk2igOMNhzUOgHSY0HNhCQ4HMFhaiF4buCB8+/ fI5uIjBA3yxdEFf0VleUt1k0mwUycJj09CZOhREORX6U7SQWhzyHoPpKQeLwfRfEziYewf OGkSxf/cT/G0OqmZlLF5NwmO6IUo6mI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678894718; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JHp/ABLKHtL5E8hN9YfgFTDRgWekarOX9gzYpju4Ars=; b=0oaZzPZ+0IW69hRgWU5g3Dyo2oASHgRdHTimsY10LEhYw0Y3e8RxxF938ZDhPorxBbE7x6 2DnhwzNwSKwD29Bw== 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 76AD213A2F for ; Wed, 15 Mar 2023 15:38:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 0NbxG37mEWS9bwAAMHmgww (envelope-from ) for ; Wed, 15 Mar 2023 15:38:38 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed 3/5] [gdb/testsuite] Fix gdb.arch/i386-pkru.exp for native-gdbserver Date: Wed, 15 Mar 2023 16:38:35 +0100 Message-Id: <20230315153837.21440-4-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230315153837.21440-1-tdevries@suse.de> References: <20230315153837.21440-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.4 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: With test-case gdb.arch/i386-pkru.exp and target board native-gdbserver we run into: ... FAIL: gdb.arch/i386-pkru.exp: variable after reading pkru ... This looks similar to the the problem for which there's already an xfail, so fix this by extending the xfail matching. Tested on x86_64-linux. Also tested on openSUSE Tumbleweed, where all tests in the test-case pass. --- gdb/testsuite/gdb.arch/i386-pkru.exp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.arch/i386-pkru.exp b/gdb/testsuite/gdb.arch/i386-pkru.exp index 1f047df68ef..223a8aa95f0 100644 --- a/gdb/testsuite/gdb.arch/i386-pkru.exp +++ b/gdb/testsuite/gdb.arch/i386-pkru.exp @@ -80,7 +80,6 @@ gdb_test "info register pkru" ".*pkru.*$val1.*" "read pkru register" set val2 0x44444444 gdb_test "print /x \$pkru = $val2" "= $val2" "set pkru value" -set xval $val2 gdb_test_multiple "info register pkru" "read value after setting value" { -re -wrap ".*pkru.*$val2.*" { pass $gdb_test_name @@ -91,11 +90,21 @@ gdb_test_multiple "info register pkru" "read value after setting value" { } else { fail $gdb_test_name } - set xval $val1 } } gdb_breakpoint [ gdb_get_line_number "break here 2" ] gdb_continue_to_breakpoint "break here 2" ".*break here 2.*" -gdb_test "print /x rd_value" "= $xval" "variable after reading pkru" +gdb_test_multiple "print /x rd_value" "variable after reading pkru" { + -re -wrap "= $val2" { + pass $gdb_test_name + } + -re -wrap "= $val1" { + if { $have_xfail } { + xfail $gdb_test_name + } else { + fail $gdb_test_name + } + } +} -- 2.35.3