aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2015-05-24 12:02:30 +0200
committerDan Fandrich <dan@coneharvesters.com>2015-05-24 12:09:34 +0200
commit4a79475b139ed61c38dedb1b662e911cb89156a3 (patch)
tree5e4fdd538b98da8bfd7f91093bb850b1f072e3d6
parentb6e3da5f081bfae655939dcf4e657eb31dfe2444 (diff)
testcurl.pl: use rel2abs to make the source directory absolute
This function makes a platform-specific absolute path which uses backslashes on Windows. This form works when passing it on the command-line, as well as if the source is on another drive.
-rwxr-xr-xtests/testcurl.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index 80520bfc9..2b9e0831c 100755
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -61,7 +61,7 @@
use strict;
use Cwd;
-use Cwd 'abs_path';
+use File::Spec;
# Turn on warnings (equivalent to -w, which can't be used with /usr/bin/env)
#BEGIN { $^W = 1; }
@@ -390,7 +390,7 @@ if (-d $CURLDIR) {
}
# make the path absolute so we can use it everywhere
-$CURLDIR = abs_path("$CURLDIR");
+$CURLDIR = File::Spec->rel2abs("$CURLDIR");
$build="build-$$";
$buildlogname="buildlog-$$";
@@ -573,7 +573,7 @@ if ($configurebuild) {
} else {
logit "copying files to build dir ...";
if (($^O eq 'MSWin32') && ($targetos !~ /netware/)) {
- system("xcopy /s /q $CURLDIR .");
+ system("xcopy /s /q \"$CURLDIR\" .");
system("buildconf.bat");
}
elsif ($targetos =~ /netware/) {