From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id X1Q+JQfzQmhnQwMAWB0awg (envelope-from ) for ; Fri, 06 Jun 2025 09:54:15 -0400 Received: by simark.ca (Postfix, from userid 112) id 827241E11C; Fri, 6 Jun 2025 09:54:15 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-9.0 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE 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 7E88B1E089 for ; Fri, 6 Jun 2025 09:54:14 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E0CA7385AC33 for ; Fri, 6 Jun 2025 13:54:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E0CA7385AC33 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by sourceware.org (Postfix) with ESMTPS id A7E8D3858C50 for ; Fri, 6 Jun 2025 13:53:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A7E8D3858C50 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A7E8D3858C50 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1749218023; cv=none; b=GTdtFjyJYO4OymvVUch5PFGIYaSwh2p50yrlpIXimoN5LJF45Daec5bMo+xo+Z+4cp6kVil1oaTLBvsskZGxk7ZUx53TDqz+ZZYXj+0OCTnUQ6uoo7uUSTzta/r0ChfSLL4lK+yP/L+pGeFWQJCI2DhId/febn2pJw0dJX3ff1s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1749218023; c=relaxed/simple; bh=WVbQt9oE+KGUYwrBQVHgkXWWnu7RtToH3uM3kuj+Uq0=; h=Message-ID:Date:MIME-Version:Subject:To:From; b=ZO4stzdiFoBC+YEmYt54XU4QphzoGt7R/OTP1rBAXpUXOtxDLQwNVmTWJsKZWfMCvmAJl8jp3I+r5Qz9xlvRjFcdid4hYhGROCm2IOJOnm3bcI+dblsi6mLMMp8ybfO1nOiEQf1HQ0iCtEQ3AhPUi+JmSX6YJhEaf4dZJuRA7Xw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A7E8D3858C50 Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-450ccda1a6eso19991545e9.2 for ; Fri, 06 Jun 2025 06:53:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749218022; x=1749822822; h=content-transfer-encoding:in-reply-to:content-language:from :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wf9iPN3XHBhTmlaDZDTnSHp1VpOnGm0LpaNDvkGwREU=; b=EfTKzZD+/wtdkUaU/+wpYFRGvuEt67dpd6Cbd1JYcYGTCToI/53PhysVAoilSuK3Gm fYjyW2QQEBdLgEV+hUUp1Cilmb5WX5lOMvT/JWqyJq7Pqq9A29TJBuK4yfTJL8Whz1LP NryGpzCM+vj0W4BY7fTqF2Dt3IYwyiORomoa6iMTsAgfuodYTMhz078KGyyuxukDhETV O/kuhzczn/99uy0gKZo86+jkb6MxS5ALNJAZZr2X5oUaSP6Tjo114wX6dxgX9vB/SRjL 9A4CXP83uTidGjQtTOnFmXp6Q3ZyRAz7E9ElVXn8xmT/49Md38TSNvd10srL/pjeIx12 lHoA== X-Forwarded-Encrypted: i=1; AJvYcCUvA0YE32QU+FVrGN8byxHszy3ZyhpsMA5JrOHABa8RO4SMH/tO+v5clYN0NAafI53JfyoaxNvNZui6zg==@sourceware.org X-Gm-Message-State: AOJu0YzmGB96OWXYHpS+6uP7bCnncmwQz9FD8WpAfGnBg4umFluF7D6i V8+A0JMKIgbUCEo7SrOhosZZ6tgZ+o2nXEaCCOaHYRrO2b3/V3yv7Hva X-Gm-Gg: ASbGncsDEhyC0qf7GFOhIsnLzwugtPqyU4seQ7NRcmE7Lt4ljw4tLQlAI6KDgVAUA/6 SUGEBimUwfdfw7nsYjBihrTmLybc6yaQJuctKSsVzXYfs/BRyjbqgiS//OqYPQqFyz7JDrpCsYC JsqXDWwg9qy2+kj5R98CENYQOIs0Pl5Jk1ylIdJbKRANCZhTABWnTY940yvp4NBtUZlnBXRzFOj 3APGEBU/u9PbrOJ7P8lkqJ7n73JybQK0RDxCllKzQjPPEOWnB22VEqxUV3Ii2AKLkZ5bv27MeNM 0NaONFMijXDw8Krf/Zp3Ik+zVIOPsg6Q1rnA/96UHhoLGf57FXpIUmkNHFf3BDghXTwbVEIYO9Z +XBdv/qHmKN/f1jvg X-Google-Smtp-Source: AGHT+IFch8MM53Vi5sEdsHwn6jbWO85GDu2ccusHdDiR517pKeE1N8v2k+oO/fpRcMW9AULfx8iKXA== X-Received: by 2002:a05:600c:b86:b0:450:cd25:e68f with SMTP id 5b1f17b1804b1-452014e9325mr34107085e9.27.1749218022214; Fri, 06 Jun 2025 06:53:42 -0700 (PDT) Received: from ?IPV6:2001:8a0:facf:2b00:77f6:647:8d2f:f905? ([2001:8a0:facf:2b00:77f6:647:8d2f:f905]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-452730c7756sm22223655e9.33.2025.06.06.06.53.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 Jun 2025 06:53:40 -0700 (PDT) Message-ID: <05b32cd5-7f1b-4ef6-9d85-340c8f8094f2@palves.net> Date: Fri, 6 Jun 2025 14:53:39 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] of [PATCH v2 42/47] gdb_test_multiple: Anchor prompt match if -lbl To: Tom de Vries , gdb-patches@sourceware.org References: <20250519132308.3553663-1-pedro@palves.net> <20250519132308.3553663-43-pedro@palves.net> <9c94d111-a9a6-4c89-9e8e-4d5386f1562f@suse.de> <401356fc-d91b-4c70-89e2-9d9971b6b094@palves.net> <1d374acd-c8e9-48d2-b253-a4584366d953@palves.net> <868c00ee-c6cd-44fd-89ea-42916ba931c4@palves.net> From: Pedro Alves Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 2025-06-06 10:58, Tom de Vries wrote: > Hi Pedro, > > [ FWIW, the way this patch is posted doesn't work well with patchwork: > ... > $ git-pw patch apply 113744 > Failed to apply patch: > Applying: of [PATCH v2 42/47] gdb_test_multiple: Anchor prompt match if -lbl > error: No valid patches in input (allow with "--allow-empty") > error: could not build fake ancestor > hint: Use 'git am --show-current-patch=diff' to see the failed patch > Patch failed at 0001 of [PATCH v2 42/47] gdb_test_multiple: Anchor prompt match if -lbl > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > Odd. > $ git am --show-current-patch=diff > --- 8< --- > $ > ... > > I managed to apply it by saving the email in thunderbird and using git am, though that drops the commit message. ] Copy/pasting to a new .patch file after the "--- 8< ---" line would have preserved it. > >> --- 8< --- >>  From 93ce02b9ad0aefefc5f71b6c5d23f565f3f2e87a Mon Sep 17 00:00:00 2001 >> From: Pedro Alves >> Date: Thu, 5 Jun 2025 18:09:44 +0100 >> Subject: [PATCH] gdb_test_multiple: Anchor prompt match if -lbl >> >> The testcase added by this patch has a gdb_test_multiple call that >> wants to match different lines of output that all have a common >> prefix, and do different actions on each.  Instead of a single regular >> expression with alternatives, its clearer code if the different > > its -> it's Fixed. >> By adding the anchor to the prompt regexp, then we avoid that problem. >> > > Should "then" be dropped in this line? Indeed, done. > >> However, the same expect output buffer contents will still match the >> built-in prompt match.  That is what is fixed by this patch.  It makes >> it so that if -lbl is specified, the built-in prompt regexp has a >> leading anchor. >> > > Thanks for doing this. > > LGTM. > > Approved-By: Tom de Vries > > FWIW, I propose to apply this independently from the patch series, since AFAICT it's unrelated. > Thanks. I've merged it now. It used to be needed by the testcase added later in the series, but since it has its own independent testcase, it stands alone even better. I've merged it now with the trivial fixes. Thanks, Pedro Alves