From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id yQWBCz4Fr2iveA0AWB0awg (envelope-from ) for ; Wed, 27 Aug 2025 09:16:46 -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=fCsl9w3g; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=sdyV/b0Q; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=fCsl9w3g; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=sdyV/b0Q; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 274161E048; Wed, 27 Aug 2025 09:16:46 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=no 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 797D71E043 for ; Wed, 27 Aug 2025 09:16:45 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 23EF1384C014 for ; Wed, 27 Aug 2025 13:16:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 23EF1384C014 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=fCsl9w3g; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=sdyV/b0Q; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=fCsl9w3g; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=sdyV/b0Q 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 AD323384CBBC for ; Wed, 27 Aug 2025 13:14:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AD323384CBBC 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 AD323384CBBC 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=1756300489; cv=none; b=FwpcWFhNRXhTYSy4/rPn81zV58S5Sb8MdQ+nDSiA/Rs3KOBM5P1MhvyDB4OE2JI9u+088PfscGQ9TPWcI7/ohHVuwdxugPo7L+AChgT7mGCmu+rUugbo4dzBUF6551YRVuZoxpE9QFcGZA8ouavSCu1qD4plnS26oHyfspUCFmE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1756300489; c=relaxed/simple; bh=tCByQWavCi6AfGNlDxXUXYNT+vgRuZPEtPOgsSKeLVs=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=S7M+6EtYHOCKcXtMOQG3R4p81mtyDCMuyDsqdWoKShhFPfyRgV3TlOLAvWE5QR/SLs2d8ZSgiPbCeo3nAOUOHHcAxqidfEfcI5l7oy3Z81diCT04BXWkHP97Au7oq5yPnw70ZdvjkTqyGrLTzupm9URqb5227snsMzLqkAzsinc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AD323384CBBC Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 D16B320256 for ; Wed, 27 Aug 2025 13:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1756300482; 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=0Dbee7QcvGewkhFJSVXBQTcAiQJMF81s6rnwlUX712I=; b=fCsl9w3gcwr+OWYBv5MblLWPKHH0SlAuxJbY2fvgt5iWtMfHObWa+zn8AsCMscQefRL1F1 BbYAOUvO10dufJJ4fhQHvxxscD0IZWH1Z7Xqh0c1crnpJfiS8GvbkOMORtL4O3A7PRE+qX dPShIugN0o4DLmCHqL5yJx0KcqNdF2o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1756300482; 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=0Dbee7QcvGewkhFJSVXBQTcAiQJMF81s6rnwlUX712I=; b=sdyV/b0Q+I+2dFe0H4c9E0sHzZ+wDc+C/2nfdp6e6ggGsUREBMqg5A4GNH0u3pGlMnxQWc 9Asg4HiIXrpsOJDQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=fCsl9w3g; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="sdyV/b0Q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1756300482; 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=0Dbee7QcvGewkhFJSVXBQTcAiQJMF81s6rnwlUX712I=; b=fCsl9w3gcwr+OWYBv5MblLWPKHH0SlAuxJbY2fvgt5iWtMfHObWa+zn8AsCMscQefRL1F1 BbYAOUvO10dufJJ4fhQHvxxscD0IZWH1Z7Xqh0c1crnpJfiS8GvbkOMORtL4O3A7PRE+qX dPShIugN0o4DLmCHqL5yJx0KcqNdF2o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1756300482; 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=0Dbee7QcvGewkhFJSVXBQTcAiQJMF81s6rnwlUX712I=; b=sdyV/b0Q+I+2dFe0H4c9E0sHzZ+wDc+C/2nfdp6e6ggGsUREBMqg5A4GNH0u3pGlMnxQWc 9Asg4HiIXrpsOJDQ== 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 B9C0713867 for ; Wed, 27 Aug 2025 13:14:42 +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 0BEaLMIEr2jqYQAAD6G6ig (envelope-from ) for ; Wed, 27 Aug 2025 13:14:42 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/2] [gdb/testsuite] Fix host_file_normalize_mingw Date: Wed, 27 Aug 2025 15:14:39 +0200 Message-ID: <20250827131439.27473-3-tdevries@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250827131439.27473-1-tdevries@suse.de> References: <20250827131439.27473-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D16B320256 X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:dkim,suse.de:mid]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] 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 I ran the testsuite on msys2-ucrt64 with mount point map: ... /bin C:/msys64/usr/bin /c C: / C:/msys64 ... and ran into the problem that host_file_normalize didn't translate: ... /home/user/gdb/build/gdb/testsuite/temp/n/x ... into: ... C:/msys64/home/user/gdb/build/gdb/testsuite/temp/n/x ... Fix this in host_file_normalize_mingw and add a corresponding test in test-case gdb.testsuite/mount-point-map.exp. Tested on aarch64-linux and msys2-ucrt64. --- gdb/testsuite/gdb.testsuite/mount-point-map.exp | 4 ++++ gdb/testsuite/lib/gdb.exp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.testsuite/mount-point-map.exp b/gdb/testsuite/gdb.testsuite/mount-point-map.exp index d4c8bfdeff6..cc070622b13 100644 --- a/gdb/testsuite/gdb.testsuite/mount-point-map.exp +++ b/gdb/testsuite/gdb.testsuite/mount-point-map.exp @@ -24,3 +24,7 @@ gdb_assert { [host_file_normalize_mingw $d1 $unix_to_win] == $d2 } set d3 "C:/msys64" gdb_assert { [host_file_normalize_mingw $d3 $unix_to_win] == $d3 } + +set f1 "/home/user/gdb/build/gdb/testsuite/temp/n/x" +set f2 "C:/msys64/home/user/gdb/build/gdb/testsuite/temp/n/x" +gdb_assert { [host_file_normalize_mingw $f1 $unix_to_win] == $f2 } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index b7961eb30dc..4b0249db70b 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2381,9 +2381,9 @@ proc host_file_normalize_mingw {filename unix_to_win} { if {[string equal -length $mount_len $unix_filename $filename]} { if {[string length $filename] == $mount_len} { return "$win_filename/" - } elseif {[string index $filename $mount_len] eq "/"} { + } elseif {[string index $filename [expr $mount_len - 1]] eq "/"} { set rest [string range $filename $mount_len end] - return "$win_filename$rest" + return "$win_filename/$rest" } } } -- 2.43.0