diff options
author | Daniel Stenberg <daniel@haxx.se> | 2012-02-23 23:13:42 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2012-02-23 23:16:58 +0100 |
commit | 1a7bba1975ba40df32bac2af26f4681da69c9d89 (patch) | |
tree | f290fdf0e97e9b8d98808a8846ed872292b8d62a /tests/data/test1405 | |
parent | 21130dab4f8266a6ec8aa48ed7aec37137493977 (diff) |
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.
Diffstat (limited to 'tests/data/test1405')
-rw-r--r-- | tests/data/test1405 | 32 |
1 files changed, 17 insertions, 15 deletions
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> |