aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-01-04 23:31:04 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-01-04 23:31:04 +0000
commitfe0d7aee499df8a49e6249ac4dd9dc900b5a0a32 (patch)
tree72b26121e7dd1f0e91b02a7a0a932217ec1bdc16
parent2e42b0a252416803a90ea232dc94a0a21d5a97e5 (diff)
Daniel Egger provided 'nonewline=yes' support for the <stdout> section
-rw-r--r--tests/FILEFORMAT5
-rwxr-xr-xtests/runtests.pl6
2 files changed, 10 insertions, 1 deletions
diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 550bcb614..b29084bd6 100644
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -275,11 +275,14 @@ off the trailing newline of this given data before comparing with the one
actually sent by the client
Variables are substituted as in the <command> section.
</protocol>
-<stdout [mode="text"]>
+<stdout [mode="text"] [nonewline=yes]>
This verifies that this data was passed to stdout.
Use the mode="text" attribute if the output is in text mode on platforms that
have a text/binary difference.
+
+If 'nonewline' is set, we will cut off the trailing newline of this given data
+before comparing with the one actually received by the client
</stdout>
<file name="log/filename" [mode="text"]>
The file's contents must be identical to this after the test is complete.
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 231d75675..6a5f4a05d 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -2042,6 +2042,12 @@ sub singletest {
map s/\r\n/\n/g, @actual;
}
+ if($hash{'nonewline'}) {
+ # Yes, we must cut off the final newline from the final line
+ # of the protocol data
+ chomp($validstdout[$#validstdout]);
+ }
+
$res = compare("stdout", \@actual, \@validstdout);
if($res) {
return 1;