From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id aId0CmhZEGBoMAAAWB0awg (envelope-from ) for ; Tue, 26 Jan 2021 13:03:20 -0500 Received: by simark.ca (Postfix, from userid 112) id 2879C1EF80; Tue, 26 Jan 2021 13:03:20 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.3 required=5.0 tests=MAILING_LIST_MULTI,RDNS_NONE, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [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 B1D211E945 for ; Tue, 26 Jan 2021 13:03:19 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 67BC03857012; Tue, 26 Jan 2021 18:03:19 +0000 (GMT) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id CE9353854815 for ; Tue, 26 Jan 2021 18:03:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CE9353854815 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id E88D6AB92 for ; Tue, 26 Jan 2021 18:03:15 +0000 (UTC) Date: Tue, 26 Jan 2021 19:03:14 +0100 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH][gdb/testsuite] Fix gdb.opt/solib-intra-step.exp with -m32 and gcc-10 Message-ID: <20210126180312.GA7860@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: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Hi, When running test-case gdb.opt/solib-intra-step.exp with target board unix/-m32 and gcc-10, I run into: ... (gdb) step^M __x86.get_pc_thunk.bx () at ../sysdeps/i386/crti.S:68^M 68 ../sysdeps/i386/crti.S: No such file or directory.^M (gdb) step^M shlib_second (dummy=0) at solib-intra-step-lib.c:23^M 23 abort (); /* second-hit */^M (gdb) FAIL: gdb.opt/solib-intra-step.exp: second-hit ... The problem is that the test-case expects to step past the retry line, which is optional. Fix this by make the retry line step optional, both for shlib_first and shlib_second. Any comments? Thanks, - Tom [gdb/testsuite] Fix gdb.opt/solib-intra-step.exp with -m32 and gcc-10 gdb/testsuite/ChangeLog: 2021-01-26 Tom de Vries * gdb.opt/solib-intra-step.exp: Make step into retry line optional. --- gdb/testsuite/gdb.opt/solib-intra-step.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.opt/solib-intra-step.exp b/gdb/testsuite/gdb.opt/solib-intra-step.exp index ad19895d890..13e0cf04c7a 100644 --- a/gdb/testsuite/gdb.opt/solib-intra-step.exp +++ b/gdb/testsuite/gdb.opt/solib-intra-step.exp @@ -63,7 +63,7 @@ gdb_test_multiple "step" $test { exp_continue } -re -wrap "get_pc_thunk.*" { - if { $state != 1 } { + if { $state != 0 && $state != 1 } { set state -1 } else { set state 2 @@ -89,7 +89,7 @@ gdb_test_multiple "step" $test { exp_continue } -re -wrap "get_pc_thunk.*" { - if { $state != 1 } { + if { $state != 0 && $state != 1 } { set state -1 } else { set state 2