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

support for using protocol without a trailing newline

parent 7d043f46

tests/FILEFORMAT

+4 −2
Original line number Original line Diff line number Diff line
@@ -62,8 +62,10 @@ One regex per line that is removed from the protocol dumps before the 
comparison is made. This is very useful to remove dependencies on dynamicly

comparison is made. This is very useful to remove dependencies on dynamicly

changing protocol data such as port numbers or user-agent strings.

changing protocol data such as port numbers or user-agent strings.

</strip>

</strip>

<protocol>

<protocol [nonewline=yes]>

the protocol dump curl should transmit

the protocol dump curl should transmit, if 'nonewline' is set, we will cut

off the trailing newline of this given data before comparing with the one

actually sent by the client

</protocol>

</protocol>

<stdout>

<stdout>

This verfies that this data was passed to stdout.

This verfies that this data was passed to stdout.

tests/runtests.pl

+9 −0
Original line number Original line Diff line number Diff line
@@ -602,6 +602,15 @@ sub singletest { 




        my @protstrip=@protocol;

        my @protstrip=@protocol;





        # check if there's any attributes on the verify/protocol section

        my %hash = getpartattr("verify", "protocol");



        if($hash{'nonewline'}) {

            # Yes, we must cut off the final newline from the final line

            # of the protocol data

            chomp($protstrip[$#protstrip]);

        }



        for(@strip) {

        for(@strip) {

            # strip all patterns from both arrays

            # strip all patterns from both arrays

            @out = striparray( $_, \@out);

            @out = striparray( $_, \@out);