aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2010-01-17 13:33:27 +0000
committerYang Tse <yangsita@gmail.com>2010-01-17 13:33:27 +0000
commitb51b703a5b07966d8fddccc5c39d8c67e15acd4a (patch)
tree02a473594f270d6de8a79ee29bac0c284e6f8b76 /tests
parent071c38988dc5d8a745f671cc95176b6def7ff0ff (diff)
add some debug messages
Diffstat (limited to 'tests')
-rwxr-xr-xtests/runtests.pl16
1 files changed, 14 insertions, 2 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 97163f305..16e62b082 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -974,27 +974,34 @@ sub runhttpsserver {
my $flags = "";
if(!$stunnel) {
- return 0;
+ logmsg "DEBUG: runhttpsserver: return point 1\n";
+ return (0,0);
}
$server = servername_id($proto, $ipvnum, $idnum);
+ logmsg "DEBUG: runhttpsserver: server = $server\n";
$pidfile = $serverpidfile{$server};
+ logmsg "DEBUG: runhttpsserver: pidfile = $pidfile\n";
# don't retry if the server doesn't work
if ($doesntrun{$pidfile}) {
+ logmsg "DEBUG: runhttpsserver: return point 2\n";
return (0,0);
}
my $pid = processexists($pidfile);
if($pid > 0) {
+ logmsg "DEBUG: runhttpsserver: pid = $pid\n";
stopserver($server, "$pid");
}
unlink($pidfile) if(-f $pidfile);
$srvrname = servername_str($proto, $ipvnum, $idnum);
+ logmsg "DEBUG: runhttpsserver: srvrname = $srvrname\n";
$logfile = server_logfilename($LOGDIR, $proto, $ipvnum, $idnum);
+ logmsg "DEBUG: runhttpsserver: logfile = $logfile\n";
$flags .= "--verbose " if($debugprotocol);
$flags .= "--pidfile \"$pidfile\" --logfile \"$logfile\" ";
@@ -1003,9 +1010,11 @@ sub runhttpsserver {
$flags .= "--certfile \"$certfile\" " if($certfile);
$flags .= "--stunnel \"$stunnel\" --srcdir \"$srcdir\" ";
$flags .= "--connect $HTTPPORT --accept $HTTPSPORT";
+ logmsg "DEBUG: runhttpsserver: flags = $flags\n";
my $cmd = "$perl $srcdir/secureserver.pl $flags";
my ($httpspid, $pid2) = startnew($cmd, $pidfile, 15, 0);
+ logmsg "DEBUG: runhttpsserver: httpspid = $httpspid : pid2 = $pid2\n";
if($httpspid <= 0 || !kill(0, $httpspid)) {
# it is NOT alive
@@ -1013,6 +1022,7 @@ sub runhttpsserver {
stopserver($server, "$pid2");
displaylogs($testnumcheck);
$doesntrun{$pidfile} = 1;
+ logmsg "DEBUG: runhttpsserver: return point 3\n";
return(0,0);
}
@@ -1024,6 +1034,7 @@ sub runhttpsserver {
stopserver($server, "$httpspid $pid2");
displaylogs($testnumcheck);
$doesntrun{$pidfile} = 1;
+ logmsg "DEBUG: runhttpsserver: return point 4\n";
return (0,0);
}
# Here pid3 is actually the pid returned by the unsecure-http server.
@@ -1034,6 +1045,7 @@ sub runhttpsserver {
sleep(1);
+ logmsg "DEBUG: runhttpsserver: return point 5\n";
return ($httpspid, $pid2);
}
@@ -1148,7 +1160,7 @@ sub runftpsserver {
my $flags = "";
if(!$stunnel) {
- return 0;
+ return (0,0);
}
$server = servername_id($proto, $ipvnum, $idnum);