From 5796a1b282497684198ec6f59949d405733f7dd4 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 21 Jan 2003 10:14:25 +0000
Subject: [PATCH] runtests.pl now passes the sourcedir path to the
httpsserver.pl script
---
tests/httpsserver.pl | 17 ++++++++++++-----
tests/runtests.pl | 2 +-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/tests/httpsserver.pl b/tests/httpsserver.pl
index d255d67e56..19e4061eca 100644
--- a/tests/httpsserver.pl
+++ b/tests/httpsserver.pl
@@ -25,6 +25,12 @@ my $verbose=0; # set to 1 for debugging
my $port = 8433; # just our default, weird enough
my $target_port = 8999; # test http-server port
+
+my $path = `pwd`;
+chomp $path;
+
+my $srcdir=$path;
+
do {
if($ARGV[0] eq "-v") {
$verbose=1;
@@ -36,16 +42,17 @@ do {
$target_port=$ARGV[1];
shift @ARGV;
}
+ elsif($ARGV[0] eq "-d") {
+ $srcdir=$ARGV[1];
+ shift @ARGV;
+ }
elsif($ARGV[0] =~ /^(\d+)$/) {
$port = $1;
}
} while(shift @ARGV);
-my $path = `pwd`;
-chomp $path;
-
my $conffile="$path/stunnel.conf"; # stunnel configuration data
-my $certfile="$path/stunnel.pem"; # stunnel server certificate
+my $certfile="$srcdir/stunnel.pem"; # stunnel server certificate
my $pidfile="$path/.https.pid"; # stunnel process pid file
open(CONF, ">$conffile") || return 1;
@@ -62,7 +69,7 @@ print CONF "
connect = $target_port
";
close CONF;
-system("chmod go-rwx $conffile $path/stunnel.pem"); # secure permissions
+system("chmod go-rwx $conffile $certfile"); # secure permissions
# works only with stunnel versions < 4.00
my $cmd="$stunnel -p $certfile -P $pidfile -d $port -r $target_port 2>/dev/null";
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 46c90350f7..1c8f761dc1 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -222,7 +222,7 @@ sub runhttpsserver {
}
my $flag=$debugprotocol?"-v ":"";
- my $cmd="$perl $srcdir/httpsserver.pl $flag -r $HOSTPORT $HTTPSPORT &";
+ my $cmd="$perl $srcdir/httpsserver.pl $flag -d $srcdir -r $HOSTPORT $HTTPSPORT &";
system($cmd);
if($verbose) {
print "CMD: $cmd\n";
--
GitLab