From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 8F2D33858417 for ; Mon, 13 Feb 2023 11:26:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8F2D33858417 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676287569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=OWm3Wrb2JuSEiCq+SdZgARywyFu2JLo9BUlQ5WvocCo=; b=YsSVbOeURbcb2MuGc2HISjgPi5knYc3qxQtpABArbj+ED2WLZcFeHcS/H5sALj4mjPNOfn SoE6pQzI/PJuDEuM3ninvV/8ROyoq1kKSof/1/Owl8Go82IDXkG6OSLuCn39lowTRsqVON TbEpXGZwoTVu1FMvWcwwDc+Fe6Ufy0U= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-231-OAPBl2dvME2MU6En-IpIcQ-1; Mon, 13 Feb 2023 06:26:08 -0500 X-MC-Unique: OAPBl2dvME2MU6En-IpIcQ-1 Received: by mail-qv1-f72.google.com with SMTP id w2-20020a0cc702000000b0055c8ef137ddso6634409qvi.0 for ; Mon, 13 Feb 2023 03:26:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OWm3Wrb2JuSEiCq+SdZgARywyFu2JLo9BUlQ5WvocCo=; b=WnnE6zvzyamnkCbWKSqI6U2B/3ILzLPIKNXFN22Jlt8nEV/d6rRcxw2bux062C2fsc 7HlkPUmvu9BT6GiJN5dQoubWsa1RlDM+ScWJnzboZJy8S5nqD0blTVy5ShbostWYB86b XzgCicnThmIo/I/6ZXQGx310Nw3XYZGAsyBTIK//o9ZHAedkwsc0UHoiBSI77Y+pyXMG sd9RrHR/wEP9UlxEqnI3R7evOMZ5YyY6AOt4GvvZXcQINmw7dCAcvAokMaEN3gc26RbB bvVKJLna22kbXcMoTQ9wafyTQiXHSOmw8uyzgMBBDv66Uj8C86J4Ww1CO8rNK5z/axFa h64w== X-Gm-Message-State: AO0yUKU/okpMXg+Iz/1D369StTFokcNAVvffMfMKj03u8rpx/HRv+uXu JsgKwwULqAWAZvILz1twnBgXTrpHRCqpploXthpFnJGBdBFBWBUppLXR6/1Lwn94jMJy247u1ML n9Yigz/sUgfhm6qqAPkHAaohbTDs= X-Received: by 2002:a05:622a:1386:b0:3b9:a60f:b2bb with SMTP id o6-20020a05622a138600b003b9a60fb2bbmr41436246qtk.56.1676287567426; Mon, 13 Feb 2023 03:26:07 -0800 (PST) X-Google-Smtp-Source: AK7set8g7QAgf2ffXefOm38jsYqExq3iSCc9F1loJQSMPCU0ygz9+pL1TBxYfLBO52oYqTkWdixoxQ== X-Received: by 2002:a05:622a:1386:b0:3b9:a60f:b2bb with SMTP id o6-20020a05622a138600b003b9a60fb2bbmr41436224qtk.56.1676287567152; Mon, 13 Feb 2023 03:26:07 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id s15-20020ac85ecf000000b003b62e8b77e7sm8940013qtx.68.2023.02.13.03.26.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 03:26:06 -0800 (PST) From: Andrew Burgess To: Tom Tromey , Andrew Burgess via Gdb-patches Cc: Pedro Alves Subject: Re: [PATCH 1/2] gdb: only allow one of thread or task on breakpoints or watchpoints In-Reply-To: <87v8k6ebj6.fsf@tromey.com> References: <878rh3v3dx.fsf@redhat.com> <87v8k6ebj6.fsf@tromey.com> Date: Mon, 13 Feb 2023 11:26:04 +0000 Message-ID: <87ttzpu7qr.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tom Tromey writes: > Andrew> I gave the test a more descriptive name, and pushed both patches in this > Andrew> series. > > I didn't bisect but I suspect this caused: > > guile (set-breakpoint-thread! bp 1) > ERROR: In procedure set-breakpoint-thread!: > ERROR: In procedure gdbscm_set_breakpoint_thread_x: cannot set both task and thread attributes > Error while executing Scheme code. > (gdb) FAIL: gdb.ada/tasks.exp: attempt to set thread, but expect an error Tom, Oh, I see. You're getting a second 'ERROR:' prefix that I don't get. I could only find one other test that tries to match an error string like I'm doing, in gdb.guile/scm-parameter.exp, and in there we do treat this extra 'ERROR: ' as optional. I pushed the patch below which I think should fix the issue. Let me know if you are still seeing failures. Sorry for the breakage. Thanks, Andrew --- commit 97c195191578e9a68bfbb810eea373f5f3efcb7d Author: Andrew Burgess Date: Mon Feb 13 11:19:57 2023 +0000 gdb/testsuite: handle differences in guile error string output A new guile test added in commit: commit 0a9ccb9dd79384f3ba3f8cd75940e8868f3b526f Date: Mon Feb 6 13:04:16 2023 +0000 gdb: only allow one of thread or task on breakpoints or watchpoints fails for some versions of guile. It turns out that some versions of guile emit an error like this: (gdb) guile (set-breakpoint-thread! bp 1) ERROR: In procedure set-breakpoint-thread!: In procedure gdbscm_set_breakpoint_thread_x: cannot set both task and thread attributes Error while executing Scheme code. while other versions of guile emit the error like this: (gdb) guile (set-breakpoint-thread! bp 1) ERROR: In procedure set-breakpoint-thread!: ERROR: In procedure gdbscm_set_breakpoint_thread_x: cannot set both task and thread attributes Error while executing Scheme code. notice the extra 'ERROR: ' on the second line of output. This commit updates the test regexp to handle this optional 'ERROR: ' string. diff --git a/gdb/testsuite/gdb.ada/tasks.exp b/gdb/testsuite/gdb.ada/tasks.exp index a73a1919419..eb7ee5c9951 100644 --- a/gdb/testsuite/gdb.ada/tasks.exp +++ b/gdb/testsuite/gdb.ada/tasks.exp @@ -127,7 +127,8 @@ if {[allow_guile_tests]} { gdb_test "guile (set-breakpoint-thread! bp 1)" \ [multi_line \ "ERROR: In procedure set-breakpoint-thread!:" \ - "In procedure gdbscm_set_breakpoint_thread_x: cannot set both task and thread attributes" \ + "(ERROR: )?In procedure gdbscm_set_breakpoint_thread_x:\ + cannot set both task and thread attributes" \ "Error while executing Scheme code."] \ "attempt to set thread, but expect an error" @@ -138,7 +139,8 @@ if {[allow_guile_tests]} { gdb_test "guile (set-breakpoint-task! bp 1)" \ [multi_line \ "ERROR: In procedure set-breakpoint-task!:" \ - "In procedure gdbscm_set_breakpoint_task_x: cannot set both task and thread attributes" \ + "(ERROR: )?In procedure gdbscm_set_breakpoint_task_x:\ + cannot set both task and thread attributes" \ "Error while executing Scheme code."] \ "attempt to set task, but expect an error"