Commit 9f8e960a authored by Julien Chaffraix's avatar Julien Chaffraix
Browse files

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.
parent 06fc3569

lib/netrc.c

+0 −15
Original line number Diff line number Diff line
@@ -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) {

tests/data/test130

+1 −4
Original line number Diff line number Diff line
@@ -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

tests/data/test131

+1 −4
Original line number Diff line number Diff line
@@ -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

tests/data/test132

+1 −4
Original line number Diff line number Diff line
@@ -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

tests/data/test133

+1 −4
Original line number Diff line number Diff line
@@ -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