aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/netrc.c15
-rw-r--r--tests/data/test1305
-rw-r--r--tests/data/test1315
-rw-r--r--tests/data/test1325
-rw-r--r--tests/data/test1335
-rw-r--r--tests/data/test1345
-rw-r--r--tests/data/test2575
-rwxr-xr-xtests/runtests.pl14
8 files changed, 8 insertions, 51 deletions
diff --git a/lib/netrc.c b/lib/netrc.c
index b069c8c49..6b616c6ad 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 43ab24c09..fbcf5251b 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
<client>
-<features>
-netrc_debug
-</features>
<server>
ftp
</server>
@@ -40,7 +37,7 @@ ftp
FTP (optional .netrc; no user/pass) dir list PASV
</name>
<command>
---netrc-optional ftp://%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc ftp://%HOSTIP:%FTPPORT/
</command>
<file name="log/netrc" >
# the following two lines were created while testing curl
diff --git a/tests/data/test131 b/tests/data/test131
index 4e9ba6d9a..ad7f9e22a 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
<client>
-<features>
-netrc_debug
-</features>
<server>
ftp
</server>
@@ -41,7 +38,7 @@ ftp
FTP (optional .netrc; user/no pass) dir list PASV
</name>
<command>
---netrc-optional ftp://user2@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc ftp://user2@%HOSTIP:%FTPPORT/
</command>
<file name="log/netrc" >
# the following two lines were created while testing curl
diff --git a/tests/data/test132 b/tests/data/test132
index 2ff39fb9a..8d9e3ed60 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
<client>
-<features>
-netrc_debug
-</features>
<server>
ftp
</server>
@@ -40,7 +37,7 @@ ftp
FTP (optional .netrc; user/passwd supplied) dir list PASV
</name>
<command>
---netrc-optional ftp://mary:mark@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc ftp://mary:mark@%HOSTIP:%FTPPORT/
</command>
<file name="log/netrc" >
# the following two lines were created while testing curl
diff --git a/tests/data/test133 b/tests/data/test133
index 2e6b2c3a4..a15cfc371 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
<client>
-<features>
-netrc_debug
-</features>
<server>
ftp
</server>
@@ -40,7 +37,7 @@ ftp
FTP (compulsory .netrc; ignored user/passwd) dir list PASV
</name>
<command>
--n ftp://mary:mark@%HOSTIP:%FTPPORT/
+-n --netrc-file log/netrc ftp://mary:mark@%HOSTIP:%FTPPORT/
</command>
<file name="log/netrc" >
# the following two lines were created while testing curl
diff --git a/tests/data/test134 b/tests/data/test134
index 8ff9c1902..83035849e 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
<client>
-<features>
-netrc_debug
-</features>
<server>
ftp
</server>
@@ -40,7 +37,7 @@ ftp
FTP (optional .netrc; programmatic user/passwd) dir list PASV
</name>
<command>
---netrc-optional -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/
</command>
<file name="log/netrc" >
# the following two lines were created while testing curl
diff --git a/tests/data/test257 b/tests/data/test257
index c211c2f47..cc3b7f00a 100644
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -64,9 +64,6 @@ If this is received, the location following worked
# Client-side
<client>
-<features>
-netrc_debug
-</features>
<server>
http
</server>
@@ -74,7 +71,7 @@ http
HTTP Location: following with --netrc-optional
</name>
<command>
-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
</command>
# netrc auth for two out of three sites:
diff --git a/tests/runtests.pl b/tests/runtests.pl
index e37241523..d931b15b4 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;
}