Commit fe0d7aee authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Daniel Egger provided 'nonewline=yes' support for the <stdout> section

parent 2e42b0a2
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -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.
+6 −0
Original line number Diff line number Diff line
@@ -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;