From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id mFV4IfX6tmO/CxAAWB0awg (envelope-from ) for ; Thu, 05 Jan 2023 11:29:41 -0500 Received: by simark.ca (Postfix, from userid 112) id 7E84A1E222; Thu, 5 Jan 2023 11:29:41 -0500 (EST) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=r5X00mEd; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-6.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_MED,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (server2.sourceware.org [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 37F161E0D3 for ; Thu, 5 Jan 2023 11:29:41 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 406F4385B53E for ; Thu, 5 Jan 2023 16:29:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 406F4385B53E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1672936179; bh=rJ0PTEY9N0RTOG/R9cbMVv6EzMCtsrbWRdbXmRiYpng=; h=Date:Subject:To:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=r5X00mEdJ2yuxL55evIKdfl+Q5OFZqBhA8txB78FjOgyJKKWMs0lfnUrpRYQkyQWe X7FBIBc9ZMINxGLi6xampBAbxMYtX3iAJKa6MvAzVSqo2hvQJ8tZHQXLIuvZyi7LHu v5HuBfoRZ7vf0tl1FFQM/9CCjK3shL3PEBE/pOQo= Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id A6932385843A for ; Thu, 5 Jan 2023 16:28:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A6932385843A Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 305GSqso017844 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 5 Jan 2023 11:28:56 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 305GSqso017844 Received: from [192.168.255.180] (unknown [207.35.41.250]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 19CD51E0D3; Thu, 5 Jan 2023 11:28:51 -0500 (EST) Message-ID: <315f1d7a-a948-5512-fd89-a40d7a25e937@polymtl.ca> Date: Thu, 5 Jan 2023 11:28:54 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH] gdb: use gdb_test_multiple in gdb_breakpoint Content-Language: fr To: Tom de Vries , gdb-patches@sourceware.org References: <20230103192216.108444-1-simon.marchi@polymtl.ca> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Thu, 5 Jan 2023 16:28:52 +0000 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: , From: Simon Marchi via Gdb-patches Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" On 1/5/23 04:04, Tom de Vries wrote: > On 1/3/23 20:22, Simon Marchi via Gdb-patches wrote: >> - -re "$gdb_prompt $" { >> - if { $print_fail } { >> - fail $test_name >> - } >> - return 0 >> - } > > This caused: > ... > FAIL: gdb.dwarf2/dw2-main-no-line-number.exp: gdb_breakpoint: set breakpoint at 1 > FAIL: gdb.dwarf2/dw2-main-no-line-number.exp: !$breakpoint_at_missing_lineno_set > FAIL: gdb.go/methods.exp: going to first breakpoint (the program exited) > FAIL: gdb.go/methods.exp: going to second breakpoint (the program is no longer running) > ... > > Re-inserting this piece of code fixes it. Ah, sorry for this, and thanks for reporting. The CI test job I usually use is a bit broken right now, so I don't test as well as I should. Does the patch below look good? >From db4ea2e9710bfe460d5f99ebf8d3fd670a81dfa2 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 5 Jan 2023 11:23:45 -0500 Subject: [PATCH] gdb/testsuite: add back needed -re clause in gdb_breakpoint Commit 4b9728be ("gdb: use gdb_test_multiple in gdb_breakpoint") caused, amongst others: (gdb) break 1^M No line 1 in the current file.^M Make breakpoint pending on future shared library load? (y or [n]) n^M (gdb) FAIL: gdb.dwarf2/dw2-main-no-line-number.exp: gdb_breakpoint: set breakpoint at 1 FAIL: gdb.dwarf2/dw2-main-no-line-number.exp: !$breakpoint_at_missing_lineno_set This is because it removed one empty -re clause (matching just the prompt) that is necessary after replying "n" to the pending breakpoint question. Add this clause back. Change-Id: Ibfaa059d58bbea660bc29f0547e2f75c323fcbc6 --- gdb/testsuite/lib/gdb.exp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index e17eace4cb13..af538e5c8fbd 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -657,6 +657,12 @@ proc gdb_breakpoint { linespec args } { send_gdb "$pending_response\n" exp_continue } + -re "$gdb_prompt $" { + if { $print_fail } { + fail $test_name + } + return 0 + } } if { $print_pass } { pass $test_name base-commit: d66641b604182246b648f662d3c32200ac921365 -- 2.39.0