From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id SeMPJFnmq2qJxxYAWB0awg (envelope-from ) for ; Thu, 17 Sep 2026 09:08:41 -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=CVZ3jhxK; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ZunDiSth; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=07+k9Rcg; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=bBnyDAVM; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 8C46A1E01F; Thu, 17 Sep 2026 09:08:41 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.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,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (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 D34F61E01F for ; Thu, 17 Sep 2026 09:08:40 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A1A3B4BA79A2 for ; Thu, 17 Sep 2026 13:08:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A1A3B4BA79A2 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=CVZ3jhxK; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ZunDiSth; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=07+k9Rcg; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=bBnyDAVM Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 4F5AC4BA23EF for ; Thu, 17 Sep 2026 13:07:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4F5AC4BA23EF 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 4F5AC4BA23EF Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1789650446; cv=none; b=ehCmaiWlVWU/d8N+3IIwwVclW0rKfF/WgQBZ943DCsU245JSB/mXapfQTP/G7KDhHOn4WJ8MNEaZl3cXY4K9E6yHTYAEDGBV7Mm82J5epa5dRd0LUyzKs+6OSEwhkhXeuany4mqb4l/KXWflImSusfDsyq5fQhec+FfflkiJ8uI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1789650446; c=relaxed/simple; bh=dKhnI7J2Ayizn4Cb9P0+QQ0xduM2FvTqQfLBLpKJsGU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=A7txcYk8MzjiCXgG+BqEYxyyHcLjVdgZ0AC/of18grQdhEWcgQIbQ8FK6oLuG4ZC8kdenMsxv03zpLFIJEtN7lqqPFK3TBggYY5oSxPprcj0KlmKOoTquvE95/2qdYOHht/TrZsr8gknSMbZ2cwe6v7Ey1rrhJ2p+t95JTq9RMY= ARC-Authentication-Results: i=1; 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=CVZ3jhxK; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ZunDiSth; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=07+k9Rcg; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=bBnyDAVM DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4F5AC4BA23EF 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-out1.suse.de (Postfix) with ESMTPS id D680022471 for ; Thu, 17 Sep 2026 13:07:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1789650441; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QqecouFNsgBh39HAlBTLgmJH8+P7zej85aw4jSxxpzY=; b=CVZ3jhxKGPh70aJZb9/4XN30wsqRhlTpxQX9Mu/R08z6I8hbbxBHf/NCjywY4RTijvQ0x0 ZsfZXx5xxBrJGBVoMiKRngp47SfWHaK2ArA+lnmxZzDVucuFAu9bnCQ/mfUzZbTnjVNn70 SPTSfLPSAfRmsj2fPkVh1bLpjFi5BCM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1789650441; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QqecouFNsgBh39HAlBTLgmJH8+P7zej85aw4jSxxpzY=; b=ZunDiSthV9b/DJvLNhP1irEnOeRZw867af0IR+v15E5xrQR3l7iFCHPY9c7T9F5Udugeno IChQWQ3nUAjs3LAw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1789650436; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QqecouFNsgBh39HAlBTLgmJH8+P7zej85aw4jSxxpzY=; b=07+k9RcgFlyUP9xuhpean5zmZo9tqm546b+0LDuwrk4MMU454Gh7u/B423va1XwQK+56m+ BfagAgQPbPdYZJ9KFXLg2uFZtgqUSmbu3kboW8KQ8ZhY3T9DpujbiBRj7oZO4cwfmWrTkX 12WlOmDDwodrs/RKiCgzmazoU8pjfDw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1789650436; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QqecouFNsgBh39HAlBTLgmJH8+P7zej85aw4jSxxpzY=; b=bBnyDAVMCURlSc+KQzKZ3faWlpBUq8u5nKfNdSuOq07je9P99x0lmatjdqrpg4rPgtcSAK Uz2J7jp0JOPmFZDA== 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 6228413786 for ; Thu, 17 Sep 2026 13:07:06 +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 QWeuN+Tlq2o+JQAAD6G6ig:T2 (envelope-from ) for ; Thu, 17 Sep 2026 13:07:06 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/2] [gdb/testsuite] Fix timeout in gdb.base/gstack.exp Date: Thu, 17 Sep 2026 15:06:36 +0200 Message-ID: <20260917130637.3224975-2-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260917130637.3224975-1-tdevries@suse.de> References: <20260917130637.3224975-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.993]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid]; URIBL_BLOCKED(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo,gdb.base:url]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] 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 When running test-case gdb.base/gstack.exp on msys2-ucrt64, I run into a timeout: ... PASS: $exp: spawn inferior looping^M^M FAIL: $exp: wait for inferior to loop (timeout) ... The extra ^M is due to the translation mode of the output stream, which is set to text by default. Fix this by accepting the extra ^M, using a new proc multi_line_ttm, where ttm stands for text translation mode. --- gdb/testsuite/gdb.base/gstack.exp | 6 +++++- gdb/testsuite/lib/gdb.exp | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.base/gstack.exp b/gdb/testsuite/gdb.base/gstack.exp index bc524215d50..8c360198e93 100644 --- a/gdb/testsuite/gdb.base/gstack.exp +++ b/gdb/testsuite/gdb.base/gstack.exp @@ -33,8 +33,12 @@ set test_spawn_id $res # Wait for the spawned program to loop. set test "wait for inferior to loop" +set re \ + [multi_line_ttm \ + "looping" \ + ""] gdb_expect { - -re "looping\r\n" { + -re $re { pass $test } eof { diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 1ebdaf6ba10..c8dd4414b26 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -10772,6 +10772,24 @@ proc multi_line { args } { return [join $args "\r\n"] } +# As multi_line, but deals with text translation mode. On windows, if the +# translation mode of an output stream of an executable is set to text, every +# '\n' is translated to '\r\n'. For GDB, we work around this using +# -binary-output, so we can just use multi_line. But for other executables, +# we need to handle this. + +proc multi_line_ttm { args } { + if { ![ishost "*-*-mingw*"] } { + return [multi_line {*}$args] + } + + if { [llength $args] == 1 } { + set hint "forgot {*} before list argument?" + error "multi_line_ttm called with one argument ($hint)" + } + return [join $args "\r\r\n"] +} + # Similar to the above, but while multi_line is meant to be used to # match GDB output, this one is meant to be used to build strings to # send as GDB input. -- 2.51.0