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

runtests: make stripfile work on stdout as well 

... and have test 1700 use that to strip out the nghttpx server: headers
parent bf05606e

tests/FILEFORMAT

+3 −2
Original line number Diff line number Diff line
@@ -426,8 +426,9 @@ have a text/binary difference. 
Variables are substituted as in the <command> section.

</file>

<stripfile>

One perl op per line that operates on the file before being compared. This is

pretty advanced. Example: "s/^EPRT .*/EPRT stripped/"

One perl op per line that operates on the output file or stdout before being

compared with what is stored in the test file. This is pretty

advanced. Example: "s/^EPRT .*/EPRT stripped/"

</stripfile>

<upload>

the contents of the upload data curl should have sent

tests/data/test1700

+8 −5
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ http2 
HTTP/2 GET with Upgrade:

 </name>

 <command>

http://%HOSTIP:9015/1700 --http2 http://%HOSTIP:9015/17000001

http://%HOSTIP:%HTTP2PORT/1700 --http2 http://%HOSTIP:%HTTP2PORT/17000001

</command>

</client>
@@ -60,11 +60,11 @@ http://%HOSTIP:9015/1700 --http2 http://%HOSTIP:9015/17000001 
</strip>

<protocol>

GET /1700 HTTP/1.1

Host: %HOSTIP:9015

Host: %HOSTIP:%HTTP2PORT

Accept: */*



GET /17000001 HTTP/1.1

Host: %HOSTIP:9015

Host: %HOSTIP:%HTTP2PORT

Accept: */*



</protocol>
@@ -81,7 +81,7 @@ accept-ranges: bytes 
content-length: 6

content-type: text/html

funny-head: yesyes

server: nghttpx nghttp2/1.12.0-DEV

server: cut-out

via: 1.1 nghttpx



-foo-
@@ -89,10 +89,13 @@ HTTP/2 200 
date: Thu, 09 Nov 2010 14:49:00 GMT

content-length: 6

content-type: text/html

server: nghttpx nghttp2/1.12.0-DEV

server: cut-out

via: 1.1 nghttpx



-maa-

</stdout>

<stripfile>

s/^server:.*/server: cut-out
/

</stripfile>

</verify>

</testcase>

tests/http2-server.pl

+1 −1
Original line number Diff line number Diff line
@@ -72,4 +72,4 @@ my $cmdline="$nghttpx --backend=127.0.0.1,8990 ". 
    "--pid-file=$pidfile ".

    "--errorlog-file=$logfile";

print "RUN: $cmdline\n" if($verbose);

system("$cmdline");
 
system("$cmdline 2>/dev/null");

tests/runtests.pl

+17 −0
Original line number Diff line number Diff line
@@ -3841,6 +3841,23 @@ sub singletest { 
        # verify redirected stdout

        my @actual = loadarray($STDOUT);



        # what parts to cut off from stdout

        my @stripfile = getpart("verify", "stripfile");



        foreach my $strip (@stripfile) {

            chomp $strip;

            my @newgen;

            for(@actual) {

                eval $strip;

                if($_) {

                    push @newgen, $_;

                }

            }

            # this is to get rid of array entries that vanished (zero

            # length) because of replacements

            @actual = @newgen;

        }



        # variable-replace in the stdout we have from the test case file

        @validstdout = fixarray(@validstdout);