From c032f7c972706d5d90b018e9d0a96d56e0b25cc9 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 18 Aug 2019 15:31:47 -0400
Subject: [PATCH] Improve how qtest finds windows /bin

---
 qtest/module/TestDriver.pm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/qtest/module/TestDriver.pm b/qtest/module/TestDriver.pm
index 061d0e26..bc1cdb1c 100644
--- a/qtest/module/TestDriver.pm
+++ b/qtest/module/TestDriver.pm
@@ -1780,10 +1780,7 @@ sub winrun
     my $tempfilename = "$tempdir/winrun.tmp";
     if (! defined $winbin)
     {
-	my $comspec = $ENV{'COMSPEC'};
-	$comspec =~ s,\\,/,g;
-	if ((system("sh -c 'cd /bin; $comspec /c cd'" .
-		    " > $tempfilename") == 0) &&
+	if ((system("sh -c 'cd /bin; pwd -W' > $tempfilename") == 0) &&
 	    open(F, "<$tempfilename"))
 	{
 	    $winbin = <F>;