From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id f+LZC5YeQ2jGegMAWB0awg (envelope-from ) for ; Fri, 06 Jun 2025 13:00:06 -0400 Received: by simark.ca (Postfix, from userid 112) id 04BAB1E11C; Fri, 6 Jun 2025 13:00:06 -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 CFE3A1E0C2 for ; Fri, 6 Jun 2025 13:00:04 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5FA763856DF0 for ; Fri, 6 Jun 2025 17:00:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5FA763856DF0 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by sourceware.org (Postfix) with ESMTPS id 95FC13857B84 for ; Fri, 6 Jun 2025 16:59:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 95FC13857B84 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 95FC13857B84 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1749229176; cv=none; b=fu6qSQsggUpij7+h/v7+zP41lbw8bojwCL9Q7Jix2/qYqAp1KEoMNcC3XG9x5OKr47LibQhmxtZlBsnpJ+zr3Y95kqDNdDLlrDrF8og4dBnjEAYozv3s2aS6I24CetTRRt0PqP3/s92oR8pWfDLIsLra6aO1IMA/AuPnKXT3Z8E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1749229176; c=relaxed/simple; bh=ZgDkCrQGZXricnwIzTTos26DTBGT9/dBEa4yZzq0KnQ=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=Ne8owIxKIvu1BydYK9Tz8Jclni+wLrI2E5++YMwf7Qbubq5CqLMb0ICZYKgSMTaIudTtVsKpFrVNp82JoG0yo5W2HAZpmelXRNv0en4LntS2PEJQHqKf22IdMwoFza1rGZ0k9HGQRDZ3Tm2gUb6G6fm1vWzY06oiTVr8OBrSCug= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 95FC13857B84 Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-3a375888297so1497551f8f.1 for ; Fri, 06 Jun 2025 09:59:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749229175; x=1749833975; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=P0dme/Eb+M462TYVaTU4rv8CaJTGuXY8QEEzwsEDB1E=; b=LyUpHw+sf2OL4faeH+i/79j8FU+3gL+9B+M3Ch47C3ZOgDiioNxa7+MGZBwzRGGX4y e8FQwrZGu1LfdP3T5Yezp9OqbllFhpPpStu2iQX5UfiMy+9jAexWrMqLJ8FAaUctgjVA /0W9V3nK8EEUFNfN4Y+GE0DIxeApWyX0+QGq/KAlQxDYIG4sQKE7RsfrtodcVkMTLWEf DAqGowwmOdGALiynMiYIj1JagUvSntS/tLrovMnJ1VJxHSv9q3Ic2nKV9RgHluH+jFxi kKwLhf4H3Cx2vLH06iC3gRNXVwV/eTlcFEGNRZXvXsUxH9tlBvWgQBXZiGDBj8fK21o4 2GUg== X-Gm-Message-State: AOJu0YztmzBZuM1ZXqAMKPdF6WsHJQr2ArIZtLk8ul54VKFxrEFIHnhf +7rD6aXM9KskJ0UScWlnuyrUF+VAreArRS14VVt//dtGbj9Yr/trwT930mPEqrmG X-Gm-Gg: ASbGncvkTLPxatnOE4W7N7Ko3SbCWguap6R85hWGPz6SCe0lh5ClzhJQR7ll9n9MrD9 2uoJv5VyuYZ8IFifacJWA0e9IsotFcEE2yShAZyILaX6wOUxsXuwk7t7Zl24mMg3e9gegezADmI 8i+T7zmJwh57Rw97YESVVWl0tycbDl+C6VHE/uXMzeS3SH1lvQJMzHYc14Awkb2rwxhRXmIO2jM VO2AlaPzFndBBQnZsQgDGzyLxfP9yFkW578fXnUg78bH1gOqHOua77EBL+9c7XLGi5lKcCFLmEH wIjlQysljllAhVr9XszYm25/oiXroWk5GMCQcstjzjIoGz0eHA== X-Google-Smtp-Source: AGHT+IFlzNJpkAy4SncnJXuhgVRM3Sbpw4b+/+DRoQFkRWdyTUHIY0K1YZPeU8lJWOIyLZt51g2WgQ== X-Received: by 2002:a05:6000:144b:b0:3a5:1241:afde with SMTP id ffacd0b85a97d-3a53131d66amr4166367f8f.9.1749229175015; Fri, 06 Jun 2025 09:59:35 -0700 (PDT) Received: from localhost ([2001:8a0:facf:2b00:77f6:647:8d2f:f905]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a53229da18sm2444795f8f.19.2025.06.06.09.59.34 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 Jun 2025 09:59:34 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH] Adjust gdb.arch/amd64-watchpoint-downgrade.exp for Cygwin Date: Fri, 6 Jun 2025 17:59:30 +0100 Message-ID: <20250606165930.970618-1-pedro@palves.net> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 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 The gdb.arch/amd64-watchpoint-downgrade.exp testcase is assuming the output of debugging a single-thread program, like so, on e.g., GNU/Linux: starti Starting program: .../gdb.arch/amd64-watchpoint-downgrade/amd64-watchpoint-downgrade warning: watchpoint 1 downgraded to software watchpoint Program stopped. 0x00007ffff7fe32b0 in _start () from /lib64/ld-linux-x86-64.so.2 However, on Cygwin, where all inferiors are multi-threaded (because both Windows and the Cygwin runtime spawn a few helper threads), we get: starti Starting program: .../gdb.arch/amd64-watchpoint-downgrade/amd64-watchpoint-downgrade [New Thread 4652.0x17e4] warning: watchpoint 1 downgraded to software watchpoint Thread 1 stopped. 0x00007ffbfc1c0911 in ntdll!LdrInitShimEngineDynamic () from C:/Windows/SYSTEM32/ntdll.dll This commit adjusts the testcase to work with either output. Change-Id: I3aedfec04924ea3fb3bb87ba3251e2b720f8d59c --- gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp b/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp index dcee0407094..72db13e141c 100644 --- a/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp +++ b/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp @@ -58,7 +58,7 @@ gdb_test "starti" \ [multi_line \ "warning: watchpoint $num downgraded to software watchpoint" \ "" \ - "Program stopped\\." \ + "(Program|Thread 1) stopped\\." \ ".*"] # Watchpoint should now have downgraded to a s/w watchpoint. -- 2.49.0