From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id IcInGRQFr2iveA0AWB0awg (envelope-from ) for ; Wed, 27 Aug 2025 09:16:04 -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=V6rxIWtg; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=5zedHDx3; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=V6rxIWtg; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=5zedHDx3; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 616A51E048; Wed, 27 Aug 2025 09:16:04 -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 6A8C11E043 for ; Wed, 27 Aug 2025 09:16:03 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 19615385277D for ; Wed, 27 Aug 2025 13:16:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 19615385277D 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=V6rxIWtg; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=5zedHDx3; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=V6rxIWtg; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=5zedHDx3 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id BF465385274C for ; Wed, 27 Aug 2025 13:14:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BF465385274C 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 BF465385274C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1756300483; cv=none; b=vO07PmVuJLws5gBZRRH+ciktDd+QCYNTGsVr0TGb3MZHXYf9/wV6/bYzUQqhT87dVJF8OHj+33lmDegwuwm+lhXJIE0xU8BvFf6FAURFKniQAFludX4wqER3yijJle2Sybm9ojEgF5Zr25Yh0l2+M3G44/GPbFDjuBTOLCn+fSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1756300483; c=relaxed/simple; bh=k3chtMFDe2QRM0QcShHvBZ5wHr3WwoFicHYDyUpGuqY=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=A1HH/3zMZasj/W9fx8N+rGTepC8dvLj6a4GdW7r9QbkN0G2WLQY/Hv22BM8SVRBb8Pjupybb8P4+lvFwECQhBK5RPQgDcFizDdoKKuCr8G7JOsmHcgmK1C9ti/QQUBKOxgkbjI9mkYRygn1iQREaxL+J+GsFBaXLFYkOkmgckf8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BF465385274C 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-out1.suse.de (Postfix) with ESMTPS id B3E1122757 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=kLlMLk6acPFXI6yO4R92cBAn18bRG90z2j6UAVmtPNg=; b=V6rxIWtgCVYc8nlwXQq9laxwl/WAcD/zHh56CTWSRwphzMTBJe6/AWJ/1bQZXn2jqX/zcw JkT1V9IPiCSryDOpPpvd6msn9V4WLS0rwLpy3M7sarU5akP4nWWuXcsUqkFOpQsLSKWLBz JfotmoH1FgeffN2eqTGD+a7NM7GkcOg= 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=kLlMLk6acPFXI6yO4R92cBAn18bRG90z2j6UAVmtPNg=; b=5zedHDx3vb+PlHsxfLvh6svSHvoKHR37A3Rfuq3SO4F5140An8IqK3G4I1FjItMVeBf2kw fPdjdVewrA89UHDg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=V6rxIWtg; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=5zedHDx3 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=kLlMLk6acPFXI6yO4R92cBAn18bRG90z2j6UAVmtPNg=; b=V6rxIWtgCVYc8nlwXQq9laxwl/WAcD/zHh56CTWSRwphzMTBJe6/AWJ/1bQZXn2jqX/zcw JkT1V9IPiCSryDOpPpvd6msn9V4WLS0rwLpy3M7sarU5akP4nWWuXcsUqkFOpQsLSKWLBz JfotmoH1FgeffN2eqTGD+a7NM7GkcOg= 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=kLlMLk6acPFXI6yO4R92cBAn18bRG90z2j6UAVmtPNg=; b=5zedHDx3vb+PlHsxfLvh6svSHvoKHR37A3Rfuq3SO4F5140An8IqK3G4I1FjItMVeBf2kw fPdjdVewrA89UHDg== 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 9EC4213A31 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 IHN+JcIEr2jqYQAAD6G6ig (envelope-from ) for ; Wed, 27 Aug 2025 13:14:42 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/2] [gdb/testsuite] Add gdb.testsuite/mount-point-map.exp Date: Wed, 27 Aug 2025 15:14:38 +0200 Message-ID: <20250827131439.27473-2-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-Spamd-Result: default: False [-3.01 / 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)[]; 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)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns, suse.de:mid, suse.de:dkim] X-Rspamd-Queue-Id: B3E1122757 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action 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 Proc host_file_normalize is structured like this: ... proc host_file_normalize {filename} { if {[ishost *-*-mingw*]} { ... } return [file normalize $filename] ... so a test-case exercising the mingw specific part can only be run on a mingw host. Factor out a new proc host_file_normalize_mingw, which can be used on any host platform. Add test-case gdb.testsuite/mount-point-map.exp, exercising host_file_normalize_mingw. Tested on aarch64-linux and msys2-ucrt64. --- .../gdb.testsuite/mount-point-map.exp | 26 +++++++++ gdb/testsuite/lib/gdb.exp | 54 +++++++++++-------- 2 files changed, 58 insertions(+), 22 deletions(-) create mode 100644 gdb/testsuite/gdb.testsuite/mount-point-map.exp diff --git a/gdb/testsuite/gdb.testsuite/mount-point-map.exp b/gdb/testsuite/gdb.testsuite/mount-point-map.exp new file mode 100644 index 00000000000..d4c8bfdeff6 --- /dev/null +++ b/gdb/testsuite/gdb.testsuite/mount-point-map.exp @@ -0,0 +1,26 @@ +# Copyright 2025 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +set unix_to_win { + /bin C:/msys64/usr/bin + /c C: + / C:/msys64 +} + +set d1 "/" +set d2 "C:/msys64/" +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 } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index d3e2a454902..b7961eb30dc 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2360,6 +2360,37 @@ proc build_file_normalize {filename} { return [file normalize $filename] } +# Normalize a file name for the host machine and native Windows GDB. +# This converts a Unix file name to a Windows filename, +# per the mount table. E.g., '/c/foo' (on MSYS2) or '/cygdrive/c/foo' +# (on Cygwin) is converted to 'c:/foo'. + +proc host_file_normalize_mingw {filename unix_to_win} { + set filename [host_file_sanitize $filename] + + # If the file name already starts with a drive letter (e.g., + # C:/foo), we're done. Don't let it fallthrough to "file + # normalize", which would misinterpret it as a relative file + # name. + if {[regexp {^[A-Z]:/} $filename]} { + return $filename + } + + foreach {unix_filename win_filename} $unix_to_win { + set mount_len [string length $unix_filename] + 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 "/"} { + set rest [string range $filename $mount_len end] + return "$win_filename$rest" + } + } + } + + return [file normalize $filename] +} + # Normalize a file name for the host machine. If running native # Windows GDB, this converts a Unix file name to a Windows filename, # per the mount table. E.g., '/c/foo' (on MSYS2) or '/cygdrive/c/foo' @@ -2367,30 +2398,9 @@ proc build_file_normalize {filename} { proc host_file_normalize {filename} { if {[ishost *-*-mingw*]} { - set filename [host_file_sanitize $filename] - - # If the file name already starts with a drive letter (e.g., - # C:/foo), we're done. Don't let it fallthrough to "file - # normalize", which would misinterpret it as a relative file - # name. - if {[regexp {^[A-Z]:/} $filename]} { - return $filename - } - # Get Unix => Windows map. lassign [get_mount_point_map] _ unix_to_win - - foreach {unix_filename win_filename} $unix_to_win { - set mount_len [string length $unix_filename] - 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 "/"} { - set rest [string range $filename $mount_len end] - return "$win_filename$rest" - } - } - } + return [host_file_normalize_mingw $filename $unix_to_win] } return [file normalize $filename] -- 2.43.0