aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunter Knauf <gk@gknw.de>2005-08-30 18:37:08 +0000
committerGunter Knauf <gk@gknw.de>2005-08-30 18:37:08 +0000
commit75dbb3189aa1e0399a84fed966273d6ce53b40e6 (patch)
tree86001865cc317cf1d38f725cde5207672e1d4926
parent32330300a99c114bdfcb39076d5cafe31ac2eac7 (diff)
quick hack to make it working again on Win32 - however we should consider to set some defaults depending on the compiler architecture we guess we are since it doesnt work well if we prefer building the msvc makefile with gmake instead of nmake because we found gmake first in path....
-rwxr-xr-xtests/testcurl.pl25
1 files changed, 14 insertions, 11 deletions
diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index 2a2a2c754..cc08b155a 100755
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -412,20 +412,23 @@ if ($configurebuild) {
}
sub findinpath {
- my $c;
- my $e;
- my $p=$ENV{'PATH'};
- my @pa = split(":", $p);
- for $c (@_) {
- for $e (@pa) {
- if( -x "$e/$c") {
- return $c;
- }
- }
+ my $c;
+ my $e;
+ my $x='';
+ $x='.exe' if ($^O eq 'MSWin32');
+ my $s=':';
+ $s=';' if ($^O eq 'MSWin32');
+ my $p=$ENV{'PATH'};
+ my @pa = split($s, $p);
+ for $c (@_) {
+ for $e (@pa) {
+ if( -x "$e/$c$x") {
+ return $c;
+ }
}
+ }
}
-
my $make = findinpath("gmake", "make", "nmake");
if(!$make) {
mydie "Couldn't find make in the PATH";