From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id dTphInFdD2hFFwoAWB0awg (envelope-from ) for ; Mon, 28 Apr 2025 06:50:25 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=QDbNpy9E; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FqH02T1v; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=QDbNpy9E; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FqH02T1v; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 79F0F1E10E; Mon, 28 Apr 2025 06:50:25 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.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 ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 8BC321E0C0 for ; Mon, 28 Apr 2025 06:50:24 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2B5593857013 for ; Mon, 28 Apr 2025 10:50:24 +0000 (GMT) Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id D5E3A3858D1E for ; Mon, 28 Apr 2025 10:50:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D5E3A3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D5E3A3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1745837406; cv=none; b=EhFMy4nXUiBsRbx5DgiaPIgKXLNvBHMeT5UNWI6+0YMLHGjf0vPu4UPGSuZOcPDm22pJNBQm3BJOvdk7uPywF3COsBbufxMToljrUe3se9BSM+viTGeNsckVMbSP44TjpDcT3kdQd5jLP1sj0hPCBsDbqDFK7zIstxq09nk/Dw4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1745837406; c=relaxed/simple; bh=ui6UWh5OVZ+E1uVOH5N2w2dK7u62NnCsoFcE1oZEjKo=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature: Message-ID:Date:MIME-Version:Subject:To:From; b=G3FEa3kFnXmkM000KpcqKpVa4QQmo5os4E6T8/K2d8Sbx1vrieNuiq7qzvj/owFbVrpOo25119FnWOrlD3jXrKWI5krL2yHqqODss0XNk7xmGGdICixWNoqyckUour4qxO0aTHJS/YndJBiVFxzU5ittzUxiU9D87GUmE11Acjs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D5E3A3858D1E Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=QDbNpy9E; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FqH02T1v; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=QDbNpy9E; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FqH02T1v Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D57DA1F38F; Mon, 28 Apr 2025 10:50:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1745837404; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Qnj3Yte1fS4wDuK9zvQXFsahWqtdGNoPW2eC/8F0eK4=; b=QDbNpy9ELsamvnn5b7osK8tlzi+rsNNGpzkgllldV+ZFPulod5nw2/xumagVgNQOnkr2HS dwDU8CpL40QHhwOFtdPwvsCKGn+BpPyk0+sVOGRgI3z8JlGg7ffO1l83jtOPkUuVbTheRc LZWaBmYzMvGlI346NrMgiERUOZpLfkE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1745837404; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Qnj3Yte1fS4wDuK9zvQXFsahWqtdGNoPW2eC/8F0eK4=; b=FqH02T1v6jt7T29WHjw2kOD1EtvdcHXa3JcFzziCr8qX8LfFf17k94sQQS2eJGIaBwygul 9xkihR4pJTDfSaCg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1745837404; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Qnj3Yte1fS4wDuK9zvQXFsahWqtdGNoPW2eC/8F0eK4=; b=QDbNpy9ELsamvnn5b7osK8tlzi+rsNNGpzkgllldV+ZFPulod5nw2/xumagVgNQOnkr2HS dwDU8CpL40QHhwOFtdPwvsCKGn+BpPyk0+sVOGRgI3z8JlGg7ffO1l83jtOPkUuVbTheRc LZWaBmYzMvGlI346NrMgiERUOZpLfkE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1745837404; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Qnj3Yte1fS4wDuK9zvQXFsahWqtdGNoPW2eC/8F0eK4=; b=FqH02T1v6jt7T29WHjw2kOD1EtvdcHXa3JcFzziCr8qX8LfFf17k94sQQS2eJGIaBwygul 9xkihR4pJTDfSaCg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id BA6E513A25; Mon, 28 Apr 2025 10:50:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id RljdK1xdD2hsMAAAD6G6ig (envelope-from ); Mon, 28 Apr 2025 10:50:04 +0000 Message-ID: Date: Mon, 28 Apr 2025 12:50:08 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] Fix "set debug parser" To: Tom Tromey , gdb-patches@sourceware.org References: <20250426231242.926679-1-tom@tromey.com> Content-Language: en-US From: Tom de Vries In-Reply-To: <20250426231242.926679-1-tom@tromey.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-0.998]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org On 4/27/25 01:12, Tom Tromey wrote: > +gdb_test_no_output "set debug parse 1" > +set saw_start 0 > +gdb_test_multiple "print 23" "print with debugging" -lbl { > + "Starting parse" { > + set saw_start 1 > + exp_continue > + } > + -re ".$decimal = 23" { > + gdb_assert $saw_start $gdb_test_name > + } > +} Hi Tom, I looked at the test-case part, and noticed a few things: - the "Starting parse" is without -re prefix (I didn't realize that was allowed) - the gdb_test_multiple doesn't consume the prompt, which causes problems for subsequent tests (currently none) - the matching strings allow sub-line matching. I initially fixed the prompt consumption part by adding -wrap to '-re ".$decimal = 23"', but that makes it a two-line pattern which doesn't work with line-by-line matching. So, I get to this fixup patch: ... diff --git a/gdb/testsuite/gdb.base/exprs.exp b/gdb/testsuite/gdb.base/exprs.exp index 81e78e50e62..99bb277913c 100644 --- a/gdb/testsuite/gdb.base/exprs.exp +++ b/gdb/testsuite/gdb.base/exprs.exp @@ -287,12 +287,17 @@ gdb_test "print v_short =}{= 3" \ gdb_test_no_output "set debug parse 1" set saw_start 0 +set saw_val 0 gdb_test_multiple "print 23" "print with debugging" -lbl { - "Starting parse" { + -re "\r\nStarting parse(?=\r\n)" { set saw_start 1 exp_continue } - -re ".$decimal = 23" { - gdb_assert $saw_start $gdb_test_name + -re "\r\n.$decimal = 23(?=\r\n)" { + set saw_val 1 + exp_continue + } + -re -wrap "" { + gdb_assert { $saw_start && $saw_val } $gdb_test_name } } ... I suppose I would do: ... set re_var [string_to_regexp "$"]$decimal ... and use it here: ... -re "\r\n$re_var = 23(?=\r\n)" { ... but I guess that's personal preference. Thanks, - Tom