From 654803416989d9c90ccbea57e3b80e8f003454a5 Mon Sep 17 00:00:00 2001 From: Julien Chaffraix Date: Sat, 12 Feb 2011 08:34:36 -0800 Subject: [PATCH 2/3] tests: Cleaned up netrc testing. Removed the "netrc_debug" keyword replaced with --netrc-file additions. Removed the debug code from Curl_parsenetrc as it is superseeded by --netrc-file. --- lib/netrc.c | 15 --------------- tests/data/test130 | 5 +---- tests/data/test131 | 5 +---- tests/data/test132 | 5 +---- tests/data/test133 | 5 +---- tests/data/test134 | 5 +---- tests/data/test257 | 5 +---- tests/runtests.pl | 14 ++------------ 8 files changed, 8 insertions(+), 51 deletions(-) diff --git a/lib/netrc.c b/lib/netrc.c index b069c8c..6b616c6 100644 --- a/lib/netrc.c +++ b/lib/netrc.c @@ -80,21 +80,6 @@ int Curl_parsenetrc(const char *host, #define NETRC DOT_CHAR "netrc" -#ifdef DEBUGBUILD - { - /* This is a hack to allow testing. - * If compiled with --enable-debug and CURL_DEBUG_NETRC is defined, - * then it's the path to a substitute .netrc for testing purposes *only* */ - - char *override = curl_getenv("CURL_DEBUG_NETRC"); - - if(override) { - fprintf(stderr, "NETRC: overridden " NETRC " file: %s\n", override); - netrcfile = override; - netrc_alloc = TRUE; - } - } -#endif /* DEBUGBUILD */ if(!netrcfile) { home = curl_getenv("HOME"); /* portable environment reader */ if(home) { diff --git a/tests/data/test130 b/tests/data/test130 index 43ab24c..fbcf525 100644 --- a/tests/data/test130 +++ b/tests/data/test130 @@ -30,9 +30,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr # # Client-side - -netrc_debug - ftp @@ -40,7 +37,7 @@ ftp FTP (optional .netrc; no user/pass) dir list PASV ---netrc-optional ftp://%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file log/netrc ftp://%HOSTIP:%FTPPORT/ # the following two lines were created while testing curl diff --git a/tests/data/test131 b/tests/data/test131 index 4e9ba6d..ad7f9e2 100644 --- a/tests/data/test131 +++ b/tests/data/test131 @@ -31,9 +31,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr # # Client-side - -netrc_debug - ftp @@ -41,7 +38,7 @@ ftp FTP (optional .netrc; user/no pass) dir list PASV ---netrc-optional ftp://user2@%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file log/netrc ftp://user2@%HOSTIP:%FTPPORT/ # the following two lines were created while testing curl diff --git a/tests/data/test132 b/tests/data/test132 index 2ff39fb..8d9e3ed 100644 --- a/tests/data/test132 +++ b/tests/data/test132 @@ -30,9 +30,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr # # Client-side - -netrc_debug - ftp @@ -40,7 +37,7 @@ ftp FTP (optional .netrc; user/passwd supplied) dir list PASV ---netrc-optional ftp://mary:mark@%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file log/netrc ftp://mary:mark@%HOSTIP:%FTPPORT/ # the following two lines were created while testing curl diff --git a/tests/data/test133 b/tests/data/test133 index 2e6b2c3..a15cfc3 100644 --- a/tests/data/test133 +++ b/tests/data/test133 @@ -30,9 +30,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr # # Client-side - -netrc_debug - ftp @@ -40,7 +37,7 @@ ftp FTP (compulsory .netrc; ignored user/passwd) dir list PASV --n ftp://mary:mark@%HOSTIP:%FTPPORT/ +-n --netrc-file log/netrc ftp://mary:mark@%HOSTIP:%FTPPORT/ # the following two lines were created while testing curl diff --git a/tests/data/test134 b/tests/data/test134 index 8ff9c19..8303584 100644 --- a/tests/data/test134 +++ b/tests/data/test134 @@ -30,9 +30,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr # # Client-side - -netrc_debug - ftp @@ -40,7 +37,7 @@ ftp FTP (optional .netrc; programmatic user/passwd) dir list PASV ---netrc-optional -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file log/netrc -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/ # the following two lines were created while testing curl diff --git a/tests/data/test257 b/tests/data/test257 index c211c2f..cc3b7f0 100644 --- a/tests/data/test257 +++ b/tests/data/test257 @@ -64,9 +64,6 @@ If this is received, the location following worked # Client-side - -netrc_debug - http @@ -74,7 +71,7 @@ http HTTP Location: following with --netrc-optional -http://supersite.com/want/257 -L -x http://%HOSTIP:%HTTPPORT --netrc-optional +http://supersite.com/want/257 -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file log/netrc # netrc auth for two out of three sites: diff --git a/tests/runtests.pl b/tests/runtests.pl index e372415..d931b15 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -2146,8 +2146,6 @@ sub checksystem { if($feat =~ /debug/i) { # curl was built with --enable-debug $debug_build = 1; - # set the NETRC debug env - $ENV{'CURL_DEBUG_NETRC'} = "$LOGDIR/netrc"; } if($feat =~ /SSL/i) { # ssl enabled @@ -2476,20 +2474,12 @@ sub singletest { next; } } - elsif($f eq "axTLS") { - if($has_axtls) { - next; - } - } - elsif($f eq "netrc_debug") { - if($debug_build) { + elsif($f eq "axTLS") { + if($has_axtls) { next; } } elsif($f eq "unittest") { - # Unit tests should set the netrc filename directly, thus unset the - # environment variable. - delete($ENV{'CURL_DEBUG_NETRC'}) if $ENV{'CURL_DEBUG_NETRC'}; if($debug_build) { next; } -- 1.7.1