tests: remove debug requirement on 38 tests

For all tests using -O that were previously relying on a debug build and
the CURL_TESTDIR environment variable, use the plain --output-dir option
instead so that they can run proper in non-debug builds.

Closes #15114

diff --git a/tests/data/test1210 b/tests/data/test1210
index c8a3555cc2f004daf5ef2719fb9a114785b06b80..09f830c72bfa52c553225666e4804e638bba4523 100644 (file)
--- a/tests/data/test1210
+++ b/tests/data/test1210
@@ -24,22 +24,14 @@ Content-Type: text/html
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -J without Content-Disposition
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER?junk -J -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER?junk -J -O --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1311 b/tests/data/test1311
index cc53489aa694f7611d12ca6a051ae4ffd5349844..1a14547ced3dd882223c478f0c67f9f53c4e1ff6 100644 (file)
--- a/tests/data/test1311
+++ b/tests/data/test1311
@@ -25,22 +25,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -J output in
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -J and Content-Disposition
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1312 b/tests/data/test1312
index 6dfee1be54312e9c3c2ff30b0c1f6c8e3c4fe5c8..b67fdded7966c87b74580a5cc4abe11ed00e5627 100644 (file)
--- a/tests/data/test1312
+++ b/tests/data/test1312
@@ -25,22 +25,14 @@ Content-Disposition: inline; filename="name%TESTNUMBER;weird"
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -J output in
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -J, Content-Disposition and ; in filename
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
+%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1313 b/tests/data/test1313
index ef7b17f45535727a0c14b18cb5f8823490ad1867..922dbc7613ac0070bebaaae0e73bd05d96073aab 100644 (file)
--- a/tests/data/test1313
+++ b/tests/data/test1313
@@ -25,22 +25,14 @@ Content-Disposition: inline; filename='name%TESTNUMBER
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -J output in
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -J, Content-Disposition, uneven quotes
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1334 b/tests/data/test1334
index 4c6d15b8c7b0f155a86b2e584251e9f126199a28..1a13864c2ea1710ddbacbe57a24189fb3212a19e 100644 (file)
--- a/tests/data/test1334
+++ b/tests/data/test1334
@@ -23,22 +23,14 @@ Content-Type: text/html
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O without Content-Disposition, -D file
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1335 b/tests/data/test1335
index 6ae23eeab2c4307d9d921d2a45e1746ed051caed..a0b3aae65ed96317016432b099fac35a88a07d2f 100644 (file)
--- a/tests/data/test1335
+++ b/tests/data/test1335
@@ -23,22 +23,14 @@ Content-Type: text/html
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O without Content-Disposition, -D stdout
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1336 b/tests/data/test1336
index 9527f168971ca40869cd09c9af12b5752e008feb..dd93b5f9fc1ff54942249c8bc7802dfa03d0edcd 100644 (file)
--- a/tests/data/test1336
+++ b/tests/data/test1336
@@ -24,22 +24,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O and Content-Disposition, -D file
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1337 b/tests/data/test1337
index b54abb6ce29566df1c50f37b9ec070f411455a33..5dbddeea61d9fcd7372430d3e1dc9087e7fdf5d4 100644 (file)
--- a/tests/data/test1337
+++ b/tests/data/test1337
@@ -24,22 +24,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O and Content-Disposition, -D stdout
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1338 b/tests/data/test1338
index 9241ca0bda782bd8b78c1df883a4f06b456aeccb..bc7b641e6ed7398faade83608a15e8dc4d8fbd06 100644 (file)
--- a/tests/data/test1338
+++ b/tests/data/test1338
@@ -24,22 +24,14 @@ Content-Type: text/html
 #
 # Client-side
 <client>
-# 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
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O -J without Content-Disposition, -D file
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1339 b/tests/data/test1339
index aed9307b50802028bf47d903ecd1a5c76fdb59c8..a3533841d17441ee57729973a76cffc6cae62029 100644 (file)
--- a/tests/data/test1339
+++ b/tests/data/test1339
@@ -24,22 +24,14 @@ Content-Type: text/html
 #
 # Client-side
 <client>
-# 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
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O -J without Content-Disposition, -D stdout
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1340 b/tests/data/test1340
index d2ac8f7a32632123c12631e2150e873c48854e6c..9b6c092da3bc73b9b0c95fce0778a5ad1fda373e 100644 (file)
--- a/tests/data/test1340
+++ b/tests/data/test1340
@@ -25,22 +25,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 #
 # Client-side
 <client>
-# 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
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O -J and Content-Disposition, -D file
 </name>
-<setenv>
-CURL_TESTDIR=%PWD/%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-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
 </command>
 </client>
 
@@ -71,7 +63,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 </file2>
 
 <file3 name="%LOGDIR/stdout%TESTNUMBER" mode="text">
-curl saved to filename %PWD/%LOGDIR/name%TESTNUMBER
+curl saved to filename %LOGDIR/name%TESTNUMBER
 </file3>
 
 </verify>

diff --git a/tests/data/test1341 b/tests/data/test1341
index 8e6feafde890d443488364cdeb7de4829f774476..74cfd3b3542330606ab367534c65fa1b199306a0 100644 (file)
--- a/tests/data/test1341
+++ b/tests/data/test1341
@@ -25,22 +25,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 #
 # Client-side
 <client>
-# 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
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O -J and Content-Disposition, -D stdout
 </name>
-<setenv>
-CURL_TESTDIR=%PWD/%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-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
 </command>
 </client>
 
@@ -68,7 +60,7 @@ Connection: close
 Content-Type: text/html\r
 Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
-curl saved to filename %PWD/%LOGDIR/name%TESTNUMBER
+curl saved to filename %LOGDIR/name%TESTNUMBER
 </file2>
 
 </verify>

diff --git a/tests/data/test1342 b/tests/data/test1342
index 3da479f055377144e16e6cce7ca0a80dbd806969..6d039f7ee36e6718a3989c8bc5582af03cb1e136 100644 (file)
--- a/tests/data/test1342
+++ b/tests/data/test1342
@@ -23,22 +23,14 @@ Content-Type: text/html
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O -i without Content-Disposition, -D file
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1343 b/tests/data/test1343
index 83a199874ecee3c40f0988d1e6590079ebe13ce8..c6a18f2ba7d2cb51398389054ab0abe4b2fa835e 100644 (file)
--- a/tests/data/test1343
+++ b/tests/data/test1343
@@ -23,22 +23,14 @@ Content-Type: text/html
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O -i without Content-Disposition, -D stdout
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1344 b/tests/data/test1344
index bd6cee0d237731caf951c9a9587a2e363fa110a1..de440520e0502b3f5173e4e7bc382351838696e6 100644 (file)
--- a/tests/data/test1344
+++ b/tests/data/test1344
@@ -24,22 +24,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O -i and Content-Disposition, -D file
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1345 b/tests/data/test1345
index 2b2fcf9b0fb0303833a4c5732d89b54ad91c8842..a093e5d8cf704ebc3f60ed37862533458048f149 100644 (file)
--- a/tests/data/test1345
+++ b/tests/data/test1345
@@ -24,22 +24,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O -i and Content-Disposition, -D stdout
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1346 b/tests/data/test1346
index 13df57164287b459bfd8e491783c989d6ccedf4c..af2a35cbabffcc2fe90c2dcfe0762fd8e69eff32 100644 (file)
--- a/tests/data/test1346
+++ b/tests/data/test1346
@@ -23,22 +23,14 @@ Content-Type: text/html
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O -i without Content-Disposition, without -D
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1347 b/tests/data/test1347
index 1f683740d5f6323ca5bb566fb9e6cc6301d1cf1b..bbef9f409c0b5b9e22b829f9dfd47b424c545764 100644 (file)
--- a/tests/data/test1347
+++ b/tests/data/test1347
@@ -24,22 +24,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O -i and Content-Disposition, without -D
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1348 b/tests/data/test1348
index e922246d07949934fa581cafe24937805861f83c..fde0ffb24cc2ac2fe82c6138701bd9ffc9b6dea6 100644 (file)
--- a/tests/data/test1348
+++ b/tests/data/test1348
@@ -16,22 +16,14 @@ mooo
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file without Content-Disposition inside, using -O
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1349 b/tests/data/test1349
index 48f6f8b29228cc382d7891a1f970a52ce542f59d..41673666742150cf2b905a0c0418b63c297b4d6b 100644 (file)
--- a/tests/data/test1349
+++ b/tests/data/test1349
@@ -16,22 +16,14 @@ mooo
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file without C-D inside, using -O -D file
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-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
 </command>
 </client>
 

diff --git a/tests/data/test1350 b/tests/data/test1350
index 2ba80bd7a9cd12617536b0e325075b3d003bb15e..f896f22b14aaee09b399999a8326d1e9764f9629 100644 (file)
--- a/tests/data/test1350
+++ b/tests/data/test1350
@@ -16,22 +16,14 @@ mooo
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file without C-D inside, using -O -D stdout
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1351 b/tests/data/test1351
index c7adcc8d718a1d9ec9053ad7dd9481a861ec9201..947300f671118191baed3b74e2133ccec77b52e6 100644 (file)
--- a/tests/data/test1351
+++ b/tests/data/test1351
@@ -17,22 +17,14 @@ mooo
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file without C-D inside, using -O -J -D file
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-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
 </command>
 </client>
 

diff --git a/tests/data/test1352 b/tests/data/test1352
index 10fa85d81e2f550370f789d758ca9e881353f965..a74d2f33fe46a29421e7e3b55a9a47ea876c3973 100644 (file)
--- a/tests/data/test1352
+++ b/tests/data/test1352
@@ -17,22 +17,14 @@ mooo
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file without C-D inside, using -O -J -D stdout
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1353 b/tests/data/test1353
index c1764b7fe181f33a31b4e9870e4e502956e8233a..a4df5d8bad30ece57dda17210dd190945f8fd31d 100644 (file)
--- a/tests/data/test1353
+++ b/tests/data/test1353
@@ -16,22 +16,14 @@ mooo
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file without C-D inside, using -O -i -D file
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-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
 </command>
 </client>
 

diff --git a/tests/data/test1354 b/tests/data/test1354
index 42b7449a542d10fc8b1f154f4fe3d9717707c34b..3413d46775de2698b0e41b2198dcd8f993458f9f 100644 (file)
--- a/tests/data/test1354
+++ b/tests/data/test1354
@@ -16,22 +16,14 @@ mooo
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file without C-D inside, using -O -i -D stdout
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1355 b/tests/data/test1355
index 677dc839d68fc257cc27f3714b2408541a313879..e99dd015d94f6816ee2ace256cda0a3fad9bdb60 100644 (file)
--- a/tests/data/test1355
+++ b/tests/data/test1355
@@ -16,22 +16,14 @@ mooo
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file without C-D inside, using -O -i, without -D
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1356 b/tests/data/test1356
index b22fe47afbfc73b16659e8e641eb93a3d494d0ec..77a88be563a4e925e23c9cf7b9870e665cb46ad6 100644 (file)
--- a/tests/data/test1356
+++ b/tests/data/test1356
@@ -24,22 +24,14 @@ MOOOO
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file with Content-Disposition inside, using -O
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1357 b/tests/data/test1357
index f03aeadf99b5aa1040ba8d16d42bca06694feba2..b0943b7f6dea038e94c167a40b26ea15cdd71fb4 100644 (file)
--- a/tests/data/test1357
+++ b/tests/data/test1357
@@ -24,22 +24,14 @@ MOOOO
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file with C-D inside, using -O -D file
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-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
 </command>
 </client>
 

diff --git a/tests/data/test1358 b/tests/data/test1358
index ae5022e6511b508328cbbba73cccb2938941be2d..c71520c959d2783f88f32c57ea67114696fb6b13 100644 (file)
--- a/tests/data/test1358
+++ b/tests/data/test1358
@@ -24,22 +24,14 @@ MOOOO
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file with C-D inside, using -O -D stdout
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1359 b/tests/data/test1359
index 8f5d08a70808322e47e02719acff12fa81c0e33a..63cdc4ce35fefd8dc46c6ba9f366d2dee7648045 100644 (file)
--- a/tests/data/test1359
+++ b/tests/data/test1359
@@ -25,22 +25,14 @@ MOOOO
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file with C-D inside, using -O -J -D file
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-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
 </command>
 </client>
 

diff --git a/tests/data/test1360 b/tests/data/test1360
index b4312dd0fb6d02697f13f45ee7f290148d771111..6f8732a1ebcfb93566364bf2001c8a4b811a783a 100644 (file)
--- a/tests/data/test1360
+++ b/tests/data/test1360
@@ -25,22 +25,14 @@ MOOOO
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file with C-D inside, using -O -J -D stdout
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1361 b/tests/data/test1361
index 29a3a663d85436f6e5009df62836ab65da659889..c80b097a585b043de489ae69ac67441d1928ab13 100644 (file)
--- a/tests/data/test1361
+++ b/tests/data/test1361
@@ -24,22 +24,14 @@ MOOOO
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file with C-D inside, using -O -i -D file
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-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
 </command>
 </client>
 

diff --git a/tests/data/test1362 b/tests/data/test1362
index 294cc4825ccc1ddd3964fceac3065dfb0f7d19dc..9e4890ae05c8f44e73f391dcece492ced97a6f44 100644 (file)
--- a/tests/data/test1362
+++ b/tests/data/test1362
@@ -24,22 +24,14 @@ MOOOO
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file with C-D inside, using -O -i -D stdout
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1363 b/tests/data/test1363
index 9effa9dd18491536f03838ecf4d4f1b606230bc7..4ef72cf77266d00f289d4c62733d95409cbd4b92 100644 (file)
--- a/tests/data/test1363
+++ b/tests/data/test1363
@@ -24,22 +24,14 @@ MOOOO
 
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -O output in, using the CURL_TESTDIR variable
-<features>
-Debug
-</features>
 <server>
 ftp
 </server>
 <name>
 FTP download, file with C-D inside, using -O -i, without -D
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR
 </command>
 </client>
 

diff --git a/tests/data/test1422 b/tests/data/test1422
index 9b45612a9fa07e15b8b649aae3ca88d078216bba..9aa95bf273d3c520e7982115f5a0678cc91a6860 100644 (file)
--- a/tests/data/test1422
+++ b/tests/data/test1422
@@ -24,10 +24,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=str//nge
 #
 # Client-side
 <client>
-# 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
 <features>
-Debug
 file
 </features>
 <server>
@@ -36,11 +33,8 @@ http
 <name>
 HTTP GET with -O -J and Content-Disposition (empty file)
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-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
 </command>
 </client>
 

diff --git a/tests/data/test1443 b/tests/data/test1443
index a1e52beffeb1a0d05c95b6e6c609f4c4bb7784a9..45aead932c8c07ac62f198dde6cdfca704958214 100644 (file)
--- a/tests/data/test1443
+++ b/tests/data/test1443
@@ -25,22 +25,14 @@ Connection: close
 #
 # Client-side
 <client>
-# This relies on the debug feature to allow us to set a directory
-# in which to store the -O output
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -O and --remote-time
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time --output-dir %LOGDIR
 </command>
 # 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 33a92b6144d9729fc8325e82d283e3b5d852abfa..a3eac5dbad26867429c6d1184eef94958e8fe7d6 100644 (file)
--- a/tests/data/test1487
+++ b/tests/data/test1487
@@ -25,22 +25,14 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 #
 # Client-side
 <client>
-# this relies on the debug feature to allow us to set directory to store the
-# -J output in
-<features>
-Debug
-</features>
 <server>
 http
 </server>
 <name>
 HTTP GET with -J and Content-Disposition on 301
 </name>
-<setenv>
-CURL_TESTDIR=%LOGDIR
-</setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
 </command>
 </client>