diff options
| -rw-r--r-- | tests/data/test130 | 4 | ||||
| -rw-r--r-- | tests/data/test1304 | 2 | ||||
| -rw-r--r-- | tests/data/test131 | 4 | ||||
| -rw-r--r-- | tests/data/test132 | 4 | ||||
| -rw-r--r-- | tests/data/test133 | 4 | ||||
| -rw-r--r-- | tests/data/test134 | 4 | ||||
| -rw-r--r-- | tests/data/test257 | 4 | ||||
| -rwxr-xr-x | tests/runtests.pl | 3 | ||||
| -rw-r--r-- | tests/unit/unit1304.c | 2 |
9 files changed, 17 insertions, 14 deletions
diff --git a/tests/data/test130 b/tests/data/test130 index fbcf5251b..dcc46fc8f 100644 --- a/tests/data/test130 +++ b/tests/data/test130 @@ -37,9 +37,9 @@ ftp FTP (optional .netrc; no user/pass) dir list PASV </name> <command> ---netrc-optional --netrc-file log/netrc ftp://%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file log/netrc130 ftp://%HOSTIP:%FTPPORT/ </command> -<file name="log/netrc" > +<file name="log/netrc130" > # the following two lines were created while testing curl machine %HOSTIP login user1 password passwd1 machine %HOSTIP login user2 password passwd2 diff --git a/tests/data/test1304 b/tests/data/test1304 index f438a6929..d518de9e4 100644 --- a/tests/data/test1304 +++ b/tests/data/test1304 @@ -21,7 +21,7 @@ netrc parsing unit tests <tool> unit1304 </tool> -<file name="log/netrc"> +<file name="log/netrc1304"> machine example.com login admin password passwd machine curl.example.com login none password none </file> diff --git a/tests/data/test131 b/tests/data/test131 index ad7f9e22a..86501c627 100644 --- a/tests/data/test131 +++ b/tests/data/test131 @@ -38,9 +38,9 @@ ftp FTP (optional .netrc; user/no pass) dir list PASV </name> <command> ---netrc-optional --netrc-file log/netrc ftp://user2@%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file log/netrc131 ftp://user2@%HOSTIP:%FTPPORT/ </command> -<file name="log/netrc" > +<file name="log/netrc131" > # the following two lines were created while testing curl machine %HOSTIP login user1 password passwd1 machine %HOSTIP login user2 password passwd2 diff --git a/tests/data/test132 b/tests/data/test132 index 8d9e3ed60..ed96953bb 100644 --- a/tests/data/test132 +++ b/tests/data/test132 @@ -37,9 +37,9 @@ ftp FTP (optional .netrc; user/passwd supplied) dir list PASV </name> <command> ---netrc-optional --netrc-file log/netrc ftp://mary:mark@%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file log/netrc132 ftp://mary:mark@%HOSTIP:%FTPPORT/ </command> -<file name="log/netrc" > +<file name="log/netrc132" > # the following two lines were created while testing curl machine %HOSTIP login user1 password passwd1 machine %HOSTIP login user2 password passwd2 diff --git a/tests/data/test133 b/tests/data/test133 index a15cfc371..085092d01 100644 --- a/tests/data/test133 +++ b/tests/data/test133 @@ -37,9 +37,9 @@ ftp FTP (compulsory .netrc; ignored user/passwd) dir list PASV </name> <command> --n --netrc-file log/netrc ftp://mary:mark@%HOSTIP:%FTPPORT/ +-n --netrc-file log/netrc133 ftp://mary:mark@%HOSTIP:%FTPPORT/ </command> -<file name="log/netrc" > +<file name="log/netrc133" > # the following two lines were created while testing curl machine %HOSTIP login user1 password passwd1 machine %HOSTIP login user2 password passwd2 diff --git a/tests/data/test134 b/tests/data/test134 index 83035849e..8a3ba6204 100644 --- a/tests/data/test134 +++ b/tests/data/test134 @@ -37,9 +37,9 @@ ftp FTP (optional .netrc; programmatic user/passwd) dir list PASV </name> <command> ---netrc-optional --netrc-file log/netrc -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file log/netrc134 -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/ </command> -<file name="log/netrc" > +<file name="log/netrc134" > # the following two lines were created while testing curl machine %HOSTIP login user1 password passwd1 machine %HOSTIP login user2 password passwd2 diff --git a/tests/data/test257 b/tests/data/test257 index cc3b7f00a..45642d571 100644 --- a/tests/data/test257 +++ b/tests/data/test257 @@ -71,11 +71,11 @@ http HTTP Location: following with --netrc-optional </name> <command> -http://supersite.com/want/257 -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file log/netrc +http://supersite.com/want/257 -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file log/netrc257 </command> # netrc auth for two out of three sites: -<file name="log/netrc"> +<file name="log/netrc257"> machine supersite.com login user1 password passwd1 machine anotherone.com login user2 password passwd2 </file> diff --git a/tests/runtests.pl b/tests/runtests.pl index 773e5652a..db5023960 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -4280,6 +4280,9 @@ sub displaylogs { if(($log =~ /^file\d+\.txt/) && ($log !~ /^file$testnum\.txt/)) { next; # skip fileNnn.txt of other tests } + if(($log =~ /^netrc\d+/) && ($log !~ /^netrc$testnum/)) { + next; # skip netrcNnn of other tests + } if(($log =~ /^valgrind\d+/) && ($log !~ /^valgrind$testnum(\..*|)$/)) { next; # skip valgrindNnn of other tests } diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c index 7b2985c58..8ddd8caee 100644 --- a/tests/unit/unit1304.c +++ b/tests/unit/unit1304.c @@ -41,7 +41,7 @@ static void unit_stop(void) UNITTEST_START int result; - static const char* filename1 = "log/netrc"; + static const char* filename1 = "log/netrc1304"; memcpy(filename, filename1, strlen(filename1)); /* |