Commit 1a7bba19 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

test: --libcurl fixes 

The line endings broke when I saved the three recent patches (my fault,
not Colin's) to 'git am' them.

Adjusted the stripping of the test program for comparing to also exclude
the SSH key file name as that will differ and use a local path name.
parent 21130dab

tests/data/test1400

+8 −6
Original line number Diff line number Diff line
@@ -45,8 +45,10 @@ Accept: */* 
</protocol>

<stripfile>

s/(USERAGENT, \")[^\"]+/${1}stripped/

# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it

# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just

# ignore them

$_ = '' if /CURLOPT_SSL_VERIFYPEER/

$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/

</stripfile>

<file name="log/test1400.c">

/********* Sample code generated by the curl command line tool **********

tests/data/test1401

+12 −10
Original line number Diff line number Diff line
@@ -50,8 +50,10 @@ X-Men: cyclops, iceman 


</protocol>

<stripfile>

# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it

# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just

# ignore them

$_ = '' if /CURLOPT_SSL_VERIFYPEER/

$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/

</stripfile>

<file name="log/test1401.c">

/********* Sample code generated by the curl command line tool **********

tests/data/test1402

+10 −8
Original line number Diff line number Diff line
@@ -51,8 +51,10 @@ foo=bar&baz=quux 
<stripfile>

# curl's default user-agent varies with version, libraries etc.

s/(USERAGENT, \")[^\"]+/${1}stripped/

# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it

# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just

# ignore them

$_ = '' if /CURLOPT_SSL_VERIFYPEER/

$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/

</stripfile>

<file name="log/test1402.c">

/********* Sample code generated by the curl command line tool **********

tests/data/test1403

+8 −6
Original line number Diff line number Diff line
@@ -48,8 +48,10 @@ Accept: */* 
<stripfile>

# curl's default user-agent varies with version, libraries etc.

s/(USERAGENT, \")[^\"]+/${1}stripped/

# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it

# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just

# ignore them

$_ = '' if /CURLOPT_SSL_VERIFYPEER/

$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/

</stripfile>

<file name="log/test1403.c">

/********* Sample code generated by the curl command line tool **********

tests/data/test1404

+35 −33
Original line number Diff line number Diff line
@@ -83,8 +83,10 @@ dummy data 
<stripfile>

# curl's default user-agent varies with version, libraries etc.

s/(USERAGENT, \")[^\"]+/${1}stripped/

# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it

# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just

# ignore them

$_ = '' if /CURLOPT_SSL_VERIFYPEER/

$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/

</stripfile>

<file name="log/test1404.c">

/********* Sample code generated by the curl command line tool **********