diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-04-16 14:16:22 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-04-20 08:09:33 +0200 |
| commit | d1a2816b4128faa8ebc50ce93285c7364652856e (patch) | |
| tree | 6a8761d780dde502d76a52a740d585d0c857ba51 | |
| parent | 8dea78205e0b3c1decbb2710a874dedc7fa8be1b (diff) | |
| download | curl-d1a2816b4128faa8ebc50ce93285c7364652856e.tar.gz | |
runtests: always put test number in servercmd file
| -rw-r--r-- | tests/FILEFORMAT.md | 4 | ||||
| -rwxr-xr-x | tests/runtests.pl | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md index d01f3f17f..586b84b74 100644 --- a/tests/FILEFORMAT.md +++ b/tests/FILEFORMAT.md @@ -130,6 +130,10 @@ For HTTP/HTTPS, these are supported: ### `<servercmd>` Special-commands for the server. +The first line of this file will always be set to `Testnum [number]` by the +test script, to allow servers to read that to know what test the client is +about to issue. + #### For FTP/SMTP/POP/IMAP - `REPLY [command] [return value] [response string]` - Changes how the server diff --git a/tests/runtests.pl b/tests/runtests.pl index 82de7f7a8..5485b1519 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -175,7 +175,7 @@ my $SERVERIN="$LOGDIR/server.input"; # what curl sent the server my $SERVER2IN="$LOGDIR/server2.input"; # what curl sent the second server my $PROXYIN="$LOGDIR/proxy.input"; # what curl sent the proxy my $CURLLOG="commands.log"; # all command lines run -my $FTPDCMD="$LOGDIR/ftpserver.cmd"; # copy ftp server instructions here +my $FTPDCMD="$LOGDIR/ftpserver.cmd"; # copy server instructions here my $SERVERLOGS_LOCK="$LOGDIR/serverlogs.lock"; # server logs advisor read lock my $CURLCONFIG="../curl-config"; # curl-config from current build @@ -3675,10 +3675,9 @@ sub singletest { unlink($SERVER2IN); unlink($PROXYIN); - if(@ftpservercmd) { - # write the instructions to file - writearray($FTPDCMD, \@ftpservercmd); - } + push @ftpservercmd, "Testnum $testnum\n"; + # write the instructions to file + writearray($FTPDCMD, \@ftpservercmd); # get the command line options to use my @blaha; @@ -4029,9 +4028,6 @@ sub singletest { } } - # remove the test server commands file after each test - unlink($FTPDCMD) if(-f $FTPDCMD); - # run the postcheck command my @postcheck= getpart("client", "postcheck"); if(@postcheck) { |