From 2f9c3065fad5cd609647d7e65aad57becc0b6892 Mon Sep 17 00:00:00 2001 From: dmiller Date: Tue, 10 Mar 2026 20:23:15 +0000 Subject: [PATCH] Fix tests on Windows under MSYS2 --- ncat/test/ncat-test.pl | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ncat/test/ncat-test.pl b/ncat/test/ncat-test.pl index 2a92a89d5..0e767df33 100755 --- a/ncat/test/ncat-test.pl +++ b/ncat/test/ncat-test.pl @@ -49,11 +49,15 @@ my $ECHO; my $PERL; my $BINSH; if ($^O eq "cygwin") { - my $CYGPATH="C:/cygwin"; - $CAT = "$CYGPATH/bin/cat"; - $ECHO = "$CYGPATH/bin/echo"; - $PERL = "$CYGPATH/bin/perl"; - $BINSH = "$CYGPATH/bin/sh"; + my $CYGPATH="C:/cygwin"; + $CAT = qx{cygpath -w `which cat`} || "$CYGPATH/bin/cat"; + chomp $CAT; + $ECHO = qx{cygpath -w `which echo`} || "$CYGPATH/bin/echo"; + chomp $ECHO; + $PERL = qx{cygpath -w `which perl`} || "$CYGPATH/bin/perl"; + chomp $PERL; + $BINSH = qx{cygpath -w `which sh`} || "$CYGPATH/bin/sh"; + chomp $BINSH; } else { $CAT = "/bin/cat"; $ECHO = "/bin/echo";