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.
This commit is contained in:
@@ -37,20 +37,20 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@foo --mail-rcpt 1406@foobar.examp
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<protocol>
|
||||
EHLO user
|
||||
MAIL FROM:<1406@from> SIZE=34
|
||||
RCPT TO:<1406@foo>
|
||||
RCPT TO:<1406@foobar.example>
|
||||
DATA
|
||||
QUIT
|
||||
EHLO user
|
||||
MAIL FROM:<1406@from> SIZE=34
|
||||
RCPT TO:<1406@foo>
|
||||
RCPT TO:<1406@foobar.example>
|
||||
DATA
|
||||
QUIT
|
||||
</protocol>
|
||||
<upload>
|
||||
From: different
|
||||
To: another
|
||||
|
||||
body
|
||||
|
||||
.
|
||||
|
||||
.
|
||||
</upload>
|
||||
<file name="log/test1406.c">
|
||||
/********* Sample code generated by the curl command line tool **********
|
||||
@@ -112,8 +112,10 @@ int main(int argc, char *argv[])
|
||||
<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>
|
||||
</verify>
|
||||
</testcase>
|
||||
|
||||
Reference in New Issue
Block a user