mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
Displaying of logfiles on ftp server satrtup failure for test case #100 becomes standard.
This commit is contained in:
parent
90cd2a4753
commit
187cfc1594
@ -211,6 +211,8 @@ my $sshderror; # for socks server, ssh daemon version error
|
|||||||
my $defserverlogslocktimeout = 20; # timeout to await server logs lock removal
|
my $defserverlogslocktimeout = 20; # timeout to await server logs lock removal
|
||||||
my $defpostcommanddelay = 0; # delay between command and postcheck sections
|
my $defpostcommanddelay = 0; # delay between command and postcheck sections
|
||||||
|
|
||||||
|
my $testnumcheck; # test number, set in singletest sub.
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
# variables the command line options may set
|
# variables the command line options may set
|
||||||
#
|
#
|
||||||
@ -231,7 +233,6 @@ my %doesntrun; # servers that don't work, identified by pidfile
|
|||||||
my $torture;
|
my $torture;
|
||||||
my $tortnum;
|
my $tortnum;
|
||||||
my $tortalloc;
|
my $tortalloc;
|
||||||
my $testnumrequiringthis;
|
|
||||||
|
|
||||||
# open and close each time to allow removal at any time
|
# open and close each time to allow removal at any time
|
||||||
sub logmsg {
|
sub logmsg {
|
||||||
@ -989,7 +990,7 @@ sub runftpserver {
|
|||||||
# it is NOT alive
|
# it is NOT alive
|
||||||
logmsg "RUN: failed to start the FTP$id$nameext server\n";
|
logmsg "RUN: failed to start the FTP$id$nameext server\n";
|
||||||
stopserver("$pid2");
|
stopserver("$pid2");
|
||||||
displaylogs($testnumrequiringthis) if($testnumrequiringthis == 100);
|
displaylogs($testnumcheck) if($testnumcheck == 100);
|
||||||
$doesntrun{$pidfile} = 1;
|
$doesntrun{$pidfile} = 1;
|
||||||
return (0,0);
|
return (0,0);
|
||||||
}
|
}
|
||||||
@ -1000,7 +1001,7 @@ sub runftpserver {
|
|||||||
logmsg "RUN: FTP$id$nameext server failed verification\n";
|
logmsg "RUN: FTP$id$nameext server failed verification\n";
|
||||||
# failed to talk to it properly. Kill the server and return failure
|
# failed to talk to it properly. Kill the server and return failure
|
||||||
stopserver("$ftppid $pid2");
|
stopserver("$ftppid $pid2");
|
||||||
displaylogs($testnumrequiringthis) if($testnumrequiringthis == 100);
|
displaylogs($testnumcheck) if($testnumcheck == 100);
|
||||||
$doesntrun{$pidfile} = 1;
|
$doesntrun{$pidfile} = 1;
|
||||||
return (0,0);
|
return (0,0);
|
||||||
}
|
}
|
||||||
@ -1743,7 +1744,9 @@ sub singletest {
|
|||||||
my %feature;
|
my %feature;
|
||||||
my $cmd;
|
my $cmd;
|
||||||
|
|
||||||
$testnumrequiringthis = $testnum;
|
# copy test number to a global scope var, this allows
|
||||||
|
# testnum checking when starting test harness servers.
|
||||||
|
$testnumcheck = $testnum;
|
||||||
|
|
||||||
# load the test case file definition
|
# load the test case file definition
|
||||||
if(loadtest("${TESTDIR}/test${testnum}")) {
|
if(loadtest("${TESTDIR}/test${testnum}")) {
|
||||||
|
Loading…
Reference in New Issue
Block a user