diff options
| -rw-r--r-- | tests/FILEFORMAT | 5 | ||||
| -rwxr-xr-x | tests/runtests.pl | 6 |
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; |