From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 105133858C27; Wed, 15 Mar 2023 15:38:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 105133858C27 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678894699; bh=vMuyMgpy4JH6eA+IoJxAyH7/uFsNnr26Ul1qeXmn+TI=; h=From:To:Subject:Date:From; b=Dh9YxywT67Q5+D8Ye2fVEnQUt3QAGnv/C38dQwKiEaoD98DWhvtMw/RD8UEOUtA9J J4fnevm2wh7MWn9iSY7RgArJbODmdIABON60Bb0vYrfr0VCGAZo+m1gLacCox/2n1y yZPr6ORYcdSJsy3d7My9uE2kVapwe5+QazaVhGGY= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix gdb.arch/i386-pkru.exp for native-gdbserver X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 86091eae202f32acee55afdb6134e7f4efa20209 X-Git-Newrev: 7b0d27b62f51e0997407383100dbc64b7bc5f4ef Message-Id: <20230315153819.105133858C27@sourceware.org> Date: Wed, 15 Mar 2023 15:38:19 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D7b0d27b62f51= e0997407383100dbc64b7bc5f4ef commit 7b0d27b62f51e0997407383100dbc64b7bc5f4ef Author: Tom de Vries Date: Wed Mar 15 16:38:03 2023 +0100 [gdb/testsuite] Fix gdb.arch/i386-pkru.exp for native-gdbserver =20 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 ... =20 This looks similar to the the problem for which there's already an xfai= l, so fix this by extending the xfail matching. =20 Tested on x86_64-linux. =20 Also tested on openSUSE Tumbleweed, where all tests in the test-case pa= ss. Diff: --- 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 pkr= u register" set val2 0x44444444 gdb_test "print /x \$pkru =3D $val2" "=3D $val2" "set pkru value" =20 -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 afte= r setting value" { } else { fail $gdb_test_name } - set xval $val1 } } =20 gdb_breakpoint [ gdb_get_line_number "break here 2" ] gdb_continue_to_breakpoint "break here 2" ".*break here 2.*" =20 -gdb_test "print /x rd_value" "=3D $xval" "variable after reading pkru" +gdb_test_multiple "print /x rd_value" "variable after reading pkru" { + -re -wrap "=3D $val2" { + pass $gdb_test_name + } + -re -wrap "=3D $val1" { + if { $have_xfail } { + xfail $gdb_test_name + } else { + fail $gdb_test_name + } + } +}