From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by sourceware.org (Postfix) with ESMTPS id 91C69385DC01 for ; Tue, 31 Mar 2020 17:12:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 91C69385DC01 IronPort-SDR: bZivbDAyFTEEa56IqBYrdMZyBmf9jqf5phrA8FfP9h2YnXHXWeD5bPmWDT+dsaKWSfXoq0wa1c 7tkpml30TTtQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2020 10:12:11 -0700 IronPort-SDR: xGINY6aIWs9NrGikUzPWwgNJgHJaqZNinsdbN4M7Juv0QDJg+dq4S2jS2+tapQVDdv5YJrxRr5 sHFZeyag5GWw== X-IronPort-AV: E=Sophos;i="5.72,328,1580803200"; d="scan'208";a="422369979" Received: from labpc7920x-08.iul.intel.com (HELO localhost) ([172.28.49.151]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2020 10:12:10 -0700 From: Mihails Strasuns To: gdb-patches@sourceware.org Subject: [PATCH v3 1/9] [gdb/testsuite] allow more registers in reader test Date: Tue, 31 Mar 2020 19:13:48 +0200 Message-Id: <20200331171356.26126-1-mihails.strasuns@intel.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <166773> References: <166773> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-24.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Tue, 31 Mar 2020 17:12:14 -0000 Fixes jit-reader test failures on systems that have more registers than expected by the current condition. On Intel i9-7920X the following extra registers are printed: k0 0x0 0 k1 0x0 0 k2 0x0 0 k3 0x0 0 k4 0x0 0 k5 0x0 0 k6 0x0 0 k7 0x0 0 gdb/testsuite/ChangeLog: 2020-02-18 Mihails Strasuns * gdb.base/jit-reader.exp: relax register output check Signed-off-by: Mihails Strasuns Change-Id: I227ab8691b2363d626f7100216477ab637f619fa --- gdb/testsuite/gdb.base/jit-reader.exp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp index 7852a5b550..8663f0021d 100644 --- a/gdb/testsuite/gdb.base/jit-reader.exp +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -66,7 +66,8 @@ proc info_registers_current_frame {sp} { set any "\[^\r\n\]*" set neg_decimal "-?$decimal" - gdb_test "info registers" \ + + set expected \ [multi_line \ "rax $hex +$neg_decimal" \ "rbx $hex +$neg_decimal" \ @@ -93,6 +94,11 @@ proc info_registers_current_frame {sp} { "fs $hex +$neg_decimal" \ "gs $hex +$neg_decimal" \ ] + + # There may be more registers. + append expected ".*" + + gdb_test "info registers" $expected } proc jit_reader_test {} { @@ -170,7 +176,8 @@ proc jit_reader_test {} { # Since the JIT unwinder only provides RIP/RSP/RBP, # all other registers should show as "". - gdb_test "info registers" \ + + set expected \ [multi_line \ "rax " \ "rbx " \ @@ -198,6 +205,11 @@ proc jit_reader_test {} { "gs " \ ] + # There may be more registers. + append expected ".*" + + gdb_test "info registers" $expected + # Make sure that "info frame" doesn't crash. gdb_test "info frame" "Stack level 1, .*in main.*" -- 2.25.2 Intel Deutschland GmbH Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Gary Kershaw Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928