diff --git a/tests/data/test1210 b/tests/data/test1210 index c8a3555cc2..09f830c72b 100644 --- a/tests/data/test1210 +++ b/tests/data/test1210 @@ -24,22 +24,14 @@ Content-Type: text/html # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -J without Content-Disposition - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER?junk -J -O +http://%HOSTIP:%HTTPPORT/%TESTNUMBER?junk -J -O --output-dir %LOGDIR diff --git a/tests/data/test1311 b/tests/data/test1311 index cc53489aa6..1a14547ced 100644 --- a/tests/data/test1311 +++ b/tests/data/test1311 @@ -25,22 +25,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -J output in - -Debug - http HTTP GET with -J and Content-Disposition - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR diff --git a/tests/data/test1312 b/tests/data/test1312 index 6dfee1be54..b67fdded79 100644 --- a/tests/data/test1312 +++ b/tests/data/test1312 @@ -25,22 +25,14 @@ Content-Disposition: inline; filename="name%TESTNUMBER;weird" # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -J output in - -Debug - http HTTP GET with -J, Content-Disposition and ; in filename - -CURL_TESTDIR=%LOGDIR - -%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O +%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR diff --git a/tests/data/test1313 b/tests/data/test1313 index ef7b17f455..922dbc7613 100644 --- a/tests/data/test1313 +++ b/tests/data/test1313 @@ -25,22 +25,14 @@ Content-Disposition: inline; filename='name%TESTNUMBER # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -J output in - -Debug - http HTTP GET with -J, Content-Disposition, uneven quotes - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR diff --git a/tests/data/test1334 b/tests/data/test1334 index 4c6d15b8c7..1a13864c2e 100644 --- a/tests/data/test1334 +++ b/tests/data/test1334 @@ -23,22 +23,14 @@ Content-Type: text/html # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O without Content-Disposition, -D file - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR diff --git a/tests/data/test1335 b/tests/data/test1335 index 6ae23eeab2..a0b3aae65e 100644 --- a/tests/data/test1335 +++ b/tests/data/test1335 @@ -23,22 +23,14 @@ Content-Type: text/html # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O without Content-Disposition, -D stdout - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - --output-dir %LOGDIR diff --git a/tests/data/test1336 b/tests/data/test1336 index 9527f16897..dd93b5f9fc 100644 --- a/tests/data/test1336 +++ b/tests/data/test1336 @@ -24,22 +24,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O and Content-Disposition, -D file - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR diff --git a/tests/data/test1337 b/tests/data/test1337 index b54abb6ce2..5dbddeea61 100644 --- a/tests/data/test1337 +++ b/tests/data/test1337 @@ -24,22 +24,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O and Content-Disposition, -D stdout - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - --output-dir %LOGDIR diff --git a/tests/data/test1338 b/tests/data/test1338 index 9241ca0bda..bc7b641e6e 100644 --- a/tests/data/test1338 +++ b/tests/data/test1338 @@ -24,22 +24,14 @@ Content-Type: text/html # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O and -J output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O -J without Content-Disposition, -D file - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR diff --git a/tests/data/test1339 b/tests/data/test1339 index aed9307b50..a3533841d1 100644 --- a/tests/data/test1339 +++ b/tests/data/test1339 @@ -24,22 +24,14 @@ Content-Type: text/html # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O and -J output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O -J without Content-Disposition, -D stdout - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - --output-dir %LOGDIR diff --git a/tests/data/test1340 b/tests/data/test1340 index d2ac8f7a32..9b6c092da3 100644 --- a/tests/data/test1340 +++ b/tests/data/test1340 @@ -25,22 +25,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O and -J output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O -J and Content-Disposition, -D file - -CURL_TESTDIR=%PWD/%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER -w "curl saved to filename %{filename_effective}\n" +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER -w "curl saved to filename %{filename_effective}\n" --output-dir %LOGDIR @@ -71,7 +63,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -curl saved to filename %PWD/%LOGDIR/name%TESTNUMBER +curl saved to filename %LOGDIR/name%TESTNUMBER diff --git a/tests/data/test1341 b/tests/data/test1341 index 8e6feafde8..74cfd3b354 100644 --- a/tests/data/test1341 +++ b/tests/data/test1341 @@ -25,22 +25,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O and -J output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O -J and Content-Disposition, -D stdout - -CURL_TESTDIR=%PWD/%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - -w "curl saved to filename %{filename_effective}\n" +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - -w "curl saved to filename %{filename_effective}\n" --output-dir %LOGDIR @@ -68,7 +60,7 @@ Connection: close Content-Type: text/html Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -curl saved to filename %PWD/%LOGDIR/name%TESTNUMBER +curl saved to filename %LOGDIR/name%TESTNUMBER diff --git a/tests/data/test1342 b/tests/data/test1342 index 3da479f055..6d039f7ee3 100644 --- a/tests/data/test1342 +++ b/tests/data/test1342 @@ -23,22 +23,14 @@ Content-Type: text/html # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O -i without Content-Disposition, -D file - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR diff --git a/tests/data/test1343 b/tests/data/test1343 index 83a199874e..c6a18f2ba7 100644 --- a/tests/data/test1343 +++ b/tests/data/test1343 @@ -23,22 +23,14 @@ Content-Type: text/html # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O -i without Content-Disposition, -D stdout - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - --output-dir %LOGDIR diff --git a/tests/data/test1344 b/tests/data/test1344 index bd6cee0d23..de440520e0 100644 --- a/tests/data/test1344 +++ b/tests/data/test1344 @@ -24,22 +24,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O -i and Content-Disposition, -D file - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR diff --git a/tests/data/test1345 b/tests/data/test1345 index 2b2fcf9b0f..a093e5d8cf 100644 --- a/tests/data/test1345 +++ b/tests/data/test1345 @@ -24,22 +24,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O -i and Content-Disposition, -D stdout - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - --output-dir %LOGDIR diff --git a/tests/data/test1346 b/tests/data/test1346 index 13df571642..af2a35cbab 100644 --- a/tests/data/test1346 +++ b/tests/data/test1346 @@ -23,22 +23,14 @@ Content-Type: text/html # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O -i without Content-Disposition, without -D - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O --output-dir %LOGDIR diff --git a/tests/data/test1347 b/tests/data/test1347 index 1f683740d5..bbef9f409c 100644 --- a/tests/data/test1347 +++ b/tests/data/test1347 @@ -24,22 +24,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - http HTTP GET with -O -i and Content-Disposition, without -D - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O --output-dir %LOGDIR diff --git a/tests/data/test1348 b/tests/data/test1348 index e922246d07..fde0ffb24c 100644 --- a/tests/data/test1348 +++ b/tests/data/test1348 @@ -16,22 +16,14 @@ mooo # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file without Content-Disposition inside, using -O - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O --output-dir %LOGDIR diff --git a/tests/data/test1349 b/tests/data/test1349 index 48f6f8b292..4167366674 100644 --- a/tests/data/test1349 +++ b/tests/data/test1349 @@ -16,22 +16,14 @@ mooo # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file without C-D inside, using -O -D file - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR diff --git a/tests/data/test1350 b/tests/data/test1350 index 2ba80bd7a9..f896f22b14 100644 --- a/tests/data/test1350 +++ b/tests/data/test1350 @@ -16,22 +16,14 @@ mooo # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file without C-D inside, using -O -D stdout - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - --output-dir %LOGDIR diff --git a/tests/data/test1351 b/tests/data/test1351 index c7adcc8d71..947300f671 100644 --- a/tests/data/test1351 +++ b/tests/data/test1351 @@ -17,22 +17,14 @@ mooo # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file without C-D inside, using -O -J -D file - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR diff --git a/tests/data/test1352 b/tests/data/test1352 index 10fa85d81e..a74d2f33fe 100644 --- a/tests/data/test1352 +++ b/tests/data/test1352 @@ -17,22 +17,14 @@ mooo # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file without C-D inside, using -O -J -D stdout - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - --output-dir %LOGDIR diff --git a/tests/data/test1353 b/tests/data/test1353 index c1764b7fe1..a4df5d8bad 100644 --- a/tests/data/test1353 +++ b/tests/data/test1353 @@ -16,22 +16,14 @@ mooo # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file without C-D inside, using -O -i -D file - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR diff --git a/tests/data/test1354 b/tests/data/test1354 index 42b7449a54..3413d46775 100644 --- a/tests/data/test1354 +++ b/tests/data/test1354 @@ -16,22 +16,14 @@ mooo # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file without C-D inside, using -O -i -D stdout - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - --output-dir %LOGDIR diff --git a/tests/data/test1355 b/tests/data/test1355 index 677dc839d6..e99dd015d9 100644 --- a/tests/data/test1355 +++ b/tests/data/test1355 @@ -16,22 +16,14 @@ mooo # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file without C-D inside, using -O -i, without -D - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR diff --git a/tests/data/test1356 b/tests/data/test1356 index b22fe47afb..77a88be563 100644 --- a/tests/data/test1356 +++ b/tests/data/test1356 @@ -24,22 +24,14 @@ MOOOO # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file with Content-Disposition inside, using -O - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O --output-dir %LOGDIR diff --git a/tests/data/test1357 b/tests/data/test1357 index f03aeadf99..b0943b7f6d 100644 --- a/tests/data/test1357 +++ b/tests/data/test1357 @@ -24,22 +24,14 @@ MOOOO # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file with C-D inside, using -O -D file - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR diff --git a/tests/data/test1358 b/tests/data/test1358 index ae5022e651..c71520c959 100644 --- a/tests/data/test1358 +++ b/tests/data/test1358 @@ -24,22 +24,14 @@ MOOOO # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file with C-D inside, using -O -D stdout - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - --output-dir %LOGDIR diff --git a/tests/data/test1359 b/tests/data/test1359 index 8f5d08a708..63cdc4ce35 100644 --- a/tests/data/test1359 +++ b/tests/data/test1359 @@ -25,22 +25,14 @@ MOOOO # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file with C-D inside, using -O -J -D file - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR diff --git a/tests/data/test1360 b/tests/data/test1360 index b4312dd0fb..6f8732a1eb 100644 --- a/tests/data/test1360 +++ b/tests/data/test1360 @@ -25,22 +25,14 @@ MOOOO # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file with C-D inside, using -O -J -D stdout - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - --output-dir %LOGDIR diff --git a/tests/data/test1361 b/tests/data/test1361 index 29a3a663d8..c80b097a58 100644 --- a/tests/data/test1361 +++ b/tests/data/test1361 @@ -24,22 +24,14 @@ MOOOO # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file with C-D inside, using -O -i -D file - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR diff --git a/tests/data/test1362 b/tests/data/test1362 index 294cc4825c..9e4890ae05 100644 --- a/tests/data/test1362 +++ b/tests/data/test1362 @@ -24,22 +24,14 @@ MOOOO # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file with C-D inside, using -O -i -D stdout - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - --output-dir %LOGDIR diff --git a/tests/data/test1363 b/tests/data/test1363 index 9effa9dd18..4ef72cf772 100644 --- a/tests/data/test1363 +++ b/tests/data/test1363 @@ -24,22 +24,14 @@ MOOOO # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable - -Debug - ftp FTP download, file with C-D inside, using -O -i, without -D - -CURL_TESTDIR=%LOGDIR - -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR diff --git a/tests/data/test1422 b/tests/data/test1422 index 9b45612a9f..9aa95bf273 100644 --- a/tests/data/test1422 +++ b/tests/data/test1422 @@ -24,10 +24,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=str//nge # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -O and -J output in, using the CURL_TESTDIR variable -Debug file @@ -36,11 +33,8 @@ http HTTP GET with -O -J and Content-Disposition (empty file) - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O file://%FILE_PWD/%LOGDIR/name%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O file://%FILE_PWD/%LOGDIR/name%TESTNUMBER --output-dir %LOGDIR diff --git a/tests/data/test1443 b/tests/data/test1443 index a1e52beffe..45aead932c 100644 --- a/tests/data/test1443 +++ b/tests/data/test1443 @@ -25,22 +25,14 @@ Connection: close # # Client-side -# This relies on the debug feature to allow us to set a directory -# in which to store the -O output - -Debug - http HTTP GET with -O and --remote-time - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time --output-dir %LOGDIR # Verify the mtime of the file. The mtime is specifically chosen to be an even # number so that it can be represented exactly on a FAT filesystem. diff --git a/tests/data/test1487 b/tests/data/test1487 index 33a92b6144..a3eac5dbad 100644 --- a/tests/data/test1487 +++ b/tests/data/test1487 @@ -25,22 +25,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange # # Client-side -# this relies on the debug feature to allow us to set directory to store the -# -J output in - -Debug - http HTTP GET with -J and Content-Disposition on 301 - -CURL_TESTDIR=%LOGDIR - -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR