Commit c032f7c972706d5d90b018e9d0a96d56e0b25cc9
1 parent
89dacd8e
Improve how qtest finds windows /bin
Showing
1 changed file
with
1 additions
and
4 deletions
qtest/module/TestDriver.pm
| @@ -1780,10 +1780,7 @@ sub winrun | @@ -1780,10 +1780,7 @@ sub winrun | ||
| 1780 | my $tempfilename = "$tempdir/winrun.tmp"; | 1780 | my $tempfilename = "$tempdir/winrun.tmp"; |
| 1781 | if (! defined $winbin) | 1781 | if (! defined $winbin) |
| 1782 | { | 1782 | { |
| 1783 | - my $comspec = $ENV{'COMSPEC'}; | ||
| 1784 | - $comspec =~ s,\\,/,g; | ||
| 1785 | - if ((system("sh -c 'cd /bin; $comspec /c cd'" . | ||
| 1786 | - " > $tempfilename") == 0) && | 1783 | + if ((system("sh -c 'cd /bin; pwd -W' > $tempfilename") == 0) && |
| 1787 | open(F, "<$tempfilename")) | 1784 | open(F, "<$tempfilename")) |
| 1788 | { | 1785 | { |
| 1789 | $winbin = <F>; | 1786 | $winbin = <F>; |