From 1a7bba1975ba40df32bac2af26f4681da69c9d89 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 23 Feb 2012 23:13:42 +0100
Subject: 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.
---
 tests/data/test1405 | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'tests/data/test1405')

diff --git a/tests/data/test1405 b/tests/data/test1405
index 74925ee90..08981f1a1 100644
--- a/tests/data/test1405
+++ b/tests/data/test1405
@@ -41,20 +41,20 @@ ftp://%HOSTIP:%FTPPORT/1405 -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-USER anonymous
-PASS ftp@example.com
-PWD
-NOOP 1
-FAIL
-EPSV
-PASV
-TYPE I
-NOOP 2
-FAIL HARD
-SIZE 1405
-RETR 1405
-NOOP 3
-QUIT
+USER anonymous
+PASS ftp@example.com
+PWD
+NOOP 1
+FAIL
+EPSV
+PASV
+TYPE I
+NOOP 2
+FAIL HARD
+SIZE 1405
+RETR 1405
+NOOP 3
+QUIT
 </protocol>
 <file name="log/test1405.c">
 /********* Sample code generated by the curl command line tool **********
@@ -126,8 +126,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>
-- 
cgit v1.2.3