[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 223/264: runtests: always put test number in servercmd file
From: |
gnunet |
Subject: |
[gnurl] 223/264: runtests: always put test number in servercmd file |
Date: |
Thu, 30 Apr 2020 16:08:46 +0200 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit d1a2816b4128faa8ebc50ce93285c7364652856e
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu Apr 16 14:16:22 2020 +0200
runtests: always put test number in servercmd file
---
tests/FILEFORMAT.md | 4 ++++
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) {
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 125/264: appveyor: turn disabled tests into ignored result tests, (continued)
- [gnurl] 125/264: appveyor: turn disabled tests into ignored result tests, gnunet, 2020/04/30
- [gnurl] 130/264: lib: never define CURL_CA_BUNDLE with a getenv, gnunet, 2020/04/30
- [gnurl] 127/264: appveyor: sort builds by type and add two new variants, gnunet, 2020/04/30
- [gnurl] 134/264: RELEASE-NOTES: synced, gnunet, 2020/04/30
- [gnurl] 103/264: memdebug: don't log free(NULL), gnunet, 2020/04/30
- [gnurl] 138/264: cleanup: correct copyright year range on a few files, gnunet, 2020/04/30
- [gnurl] 131/264: TODO: Option to make -Z merge lined based outputs on stdout, gnunet, 2020/04/30
- [gnurl] 104/264: build: fixed build for systems with select() in unistd.h, gnunet, 2020/04/30
- [gnurl] 226/264: multi-ssl: reset the SSL backend on `Curl_global_cleanup()`, gnunet, 2020/04/30
- [gnurl] 227/264: tests: run the SOCKS test server on a dynamic port number, gnunet, 2020/04/30
- [gnurl] 223/264: runtests: always put test number in servercmd file,
gnunet <=
- [gnurl] 205/264: tests: make 2006-2010 handle different port number lengths, gnunet, 2020/04/30
- [gnurl] 235/264: mqtt: make NOSTATE get within the debug name array, gnunet, 2020/04/30
- [gnurl] 233/264: tests: add %NOLISTENPORT and use it, gnunet, 2020/04/30
- [gnurl] 234/264: tests: run the RTSP test server on a dynamic port number, gnunet, 2020/04/30
- [gnurl] 232/264: mqtt: remove code with no purpose, gnunet, 2020/04/30
- [gnurl] 231/264: mqtt: fix Curl_read() error handling while reading remaining length, gnunet, 2020/04/30
- [gnurl] 247/264: tests/git: ignore mqttd and port files, gnunet, 2020/04/30
- [gnurl] 248/264: docs: fix two typos, gnunet, 2020/04/30
- [gnurl] 240/264: version: skip idn2_check_version() check and add precaution, gnunet, 2020/04/30
- [gnurl] 241/264: lib/mk-ca-bundle: skip empty certs, gnunet, 2020/04/30