From patchwork Sun Sep 20 15:38:19 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Dubiec X-Patchwork-Id: 144228 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E7F074BA903E for ; Sun, 20 Sep 2026 15:39:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E7F074BA903E Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=o2.pl header.i=@o2.pl header.a=rsa-sha256 header.s=20241105 header.b=zPVkCkVJ X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx-out.tlen.pl (mx-out.tlen.pl [193.222.135.145]) by sourceware.org (Postfix) with ESMTPS id 69C064BA9028 for ; Sun, 20 Sep 2026 15:39:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 69C064BA9028 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=o2.pl Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=o2.pl ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 69C064BA9028 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=193.222.135.145 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1789918743; cv=none; b=Cyc6q/DqXnqAeBiKET6wkZtIByOXxcjiJormXzbIO+tqTeIt0YkIeWiIk1ihlIdoqOQDRan4VZxRpK9ItKPmVfEpgA9CbEtOdRbATErLgejQLfDCuXUNwwEZH6aD9LQhbacwj2vosAj9jmD8dQkgsg7DpTvweD3F1O1GfRhyPgg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1789918743; c=relaxed/simple; bh=/Ckr05ObYF+ccOW0HorQCgWUItUDHwl0Jac1PsQfqT0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=xHyn59LlA4lliiWJDy5TXwb7p11pJz+c6meBQMJA11b5PgzEybn2hKNC1wsBjBS0VJ4VCtiJlvxGBxngvq+cQjRziV2KbNP3jTLhhuMCyKYRZ3uZvyY3UyVJQ6fqeVb+4eI4L3JobMMUwcmrCxoJ6sn4rJzDTtsGC8brfiWXyXM= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=o2.pl header.i=@o2.pl header.a=rsa-sha256 header.s=20241105 header.b=zPVkCkVJ DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 69C064BA9028 Received: (wp-smtpd smtp.tlen.pl 47207 invoked from network); 20 Sep 2026 17:39:01 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=20241105; t=1789918741; bh=vZo0Smx7Ky4qse68VGlKId0mg/n1eHdIY2wo0IZJNt8=; h=From:To:Cc:Subject; b=zPVkCkVJqGKKActEtz1yLUSlI/sFnpHCwoe2Io/SXEY5mK/Z+0zni16SH8GSIq1BG b+ysd0NOhdGqwWRyacEO2QEzGHIWFvXyl7z6X1W2dWNuGOzD7H+t5VHHw9IeGxZPgN CI9U+AhZBH6wfjLUfdUD8e7gQkAbF+SexEjoTbBcKesjelYGCZFrqUHA5Fv+snRxDt fsdiUoW4/9AHffa1lemkC7VdW+naQbuWwsx1pxDk9Ex3OuJpqLzBofd5HEcF2o8mJ+ W59a74fuzSsr8fJMcjEch+NIhiC6B/lp8z1W4krXtFfsCPQkE/2aNSazVXK9Vlc3fT KcKnP05Zyh5zg== Received: from jdxpc (ip-94-42-228-91.multimo.pl [94.42.228.91]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with TLS_AES_256_GCM_SHA384 encrypted SMTP for ; 20 Sep 2026 17:39:01 +0200 From: Jan Dubiec To: binutils@sourceware.org Cc: Jan Dubiec , Jan Beulich Subject: [PATCH v2] binutils: testsuite: Fix "objdump --source-comment" test case on Windows. Date: Sun, 20 Sep 2026 17:38:19 +0200 Message-ID: <20260920153850.6958-1-jdx@o2.pl> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 X-WP-MailID: cf550ec3ef8b7c7dd25e4a96e0592541 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000006 [wSVi] X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_PBL, SPF_HELO_NONE, SPF_PASS, TXREP shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org One of the objdump test cases fails on Windows: [...] Running /d/Works/binutils/binutils/testsuite/binutils-all/objdump.exp ... Version /d/Works/xcomp/build-binutils-h8300-mingw/binutils/objdump 2.47.50.20260913 FAIL: objdump --source-comment [...] This is because, under Windows/MSYS2, command-line arguments are subject to automatic conversion of Unix-style paths to Windows-style paths, as described on https://www.msys2.org/docs/filesystem-paths/. As a result, only one slash is passed to objdump, which emits "/static int local = 2" instead of the expected "//static int local = 2". This patch fixes the issue using the method described on the aforementioned page. Signed-off-by: Jan Dubiec --- binutils/testsuite/binutils-all/objdump.exp | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp index 734f93298ed..99c74c4fd57 100644 --- a/binutils/testsuite/binutils-all/objdump.exp +++ b/binutils/testsuite/binutils-all/objdump.exp @@ -939,7 +939,29 @@ proc test_objdump_S { } { set test "objdump --source-comment" - set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble-all --source-comment=// tmpdir/testprog${exe}"] + if { [ishost *-*-mingw*] } then { + # Under Windows/MSYS2, command-line arguments are subject to automatic + # conversion of Unix-style paths to Windows-style paths, which can + # sometimes cause problems, as in this case. + + # Save the current value of MSYS2_ARG_CONV_EXCL. + set conv_excl_was_set [info exists ::env(MSYS2_ARG_CONV_EXCL)] + if {$conv_excl_was_set} { + set conv_excl $::env(MSYS2_ARG_CONV_EXCL) + } + + set ::env(MSYS2_ARG_CONV_EXCL) "--source-comment=" + set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble-all --source-comment=// tmpdir/testprog${exe}"] + + # Restore the previous value of MSYS2_ARG_CONV_EXCL. + if {$conv_excl_was_set} { + set ::env(MSYS2_ARG_CONV_EXCL) $conv_excl + } else { + unset ::env(MSYS2_ARG_CONV_EXCL) + } + } else { + set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble-all --source-comment=// tmpdir/testprog${exe}"] + } set want "//static int local = 2"