diff --git a/tests/data/test1903 b/tests/data/test1903
index 5a4d3e0a5..ff5a0f29d 100644
--- a/tests/data/test1903
+++ b/tests/data/test1903
@@ -33,7 +33,7 @@ CURLOPT_COOKIEFILE then reset then set again
lib%TESTNUMBER
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER %LOGDIR/cookies%TESTNUMBER
# Netscape HTTP Cookie File
diff --git a/tests/data/test1905 b/tests/data/test1905
index cf2498ff9..308dc9a39 100644
--- a/tests/data/test1905
+++ b/tests/data/test1905
@@ -33,7 +33,7 @@ CURLOPT_COOKIELIST set to "FLUSH" of a shared cookie object
lib%TESTNUMBER
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER %LOGDIR/cookies%TESTNUMBER
cookies
diff --git a/tests/data/test1908 b/tests/data/test1908
index 69058a208..4ec55ed23 100644
--- a/tests/data/test1908
+++ b/tests/data/test1908
@@ -51,7 +51,7 @@ lib%TESTNUMBER
-%HOSTIP:%HTTPPORT/%TESTNUMBER
+%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/altsvc-%TESTNUMBER
diff --git a/tests/data/test506 b/tests/data/test506
index d6196ec02..30d4c6215 100644
--- a/tests/data/test506
+++ b/tests/data/test506
@@ -74,7 +74,7 @@ TZ=GMT
lib%TESTNUMBER
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/jar%TESTNUMBER
diff --git a/tests/data/test568 b/tests/data/test568
index 7f7df731c..700fd44bf 100644
--- a/tests/data/test568
+++ b/tests/data/test568
@@ -58,7 +58,7 @@ lib%TESTNUMBER
RTSP Announce (PUT and POST style) test
-rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt
# file written before test command runs
diff --git a/tests/data/test572 b/tests/data/test572
index ff4998889..4ac86bc9b 100644
--- a/tests/data/test572
+++ b/tests/data/test572
@@ -73,7 +73,7 @@ lib%TESTNUMBER
RTSP GET_PARAMETER (Put/Heartbeat/Post)
-rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt
# file written before test command runs
diff --git a/tests/data/test654 b/tests/data/test654
index f046f9e27..c71a047af 100644
--- a/tests/data/test654
+++ b/tests/data/test654
@@ -54,7 +54,7 @@ lib%TESTNUMBER
HTTP duplicate easy handle with mime data
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt
This is data from a file
diff --git a/tests/data/test668 b/tests/data/test668
index 984d2e0d2..ab7cbec99 100644
--- a/tests/data/test668
+++ b/tests/data/test668
@@ -47,7 +47,7 @@ lib%TESTNUMBER
HTTP mimepost early end of data detection
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt
This is data from a file
diff --git a/tests/data/test676 b/tests/data/test676
index 4ca312c1b..6e1fd193f 100644
--- a/tests/data/test676
+++ b/tests/data/test676
@@ -44,7 +44,7 @@ Content-Type: text/html
# Client-side
-
+
%HOSTIP TRUE /we/want/ FALSE 2118138987 proven yes
@@ -59,7 +59,7 @@ lib%TESTNUMBER
verify setting CURLOPT_COOKIEFILE to NULL again
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER %LOGDIR/cookies676
cookies
diff --git a/tests/libtest/lib1903.c b/tests/libtest/lib1903.c
index 701cd7f0d..240dbe729 100644
--- a/tests/libtest/lib1903.c
+++ b/tests/libtest/lib1903.c
@@ -38,13 +38,13 @@ int test(char *URL)
goto cleanup;
curl_easy_setopt(ch, CURLOPT_URL, URL);
- curl_easy_setopt(ch, CURLOPT_COOKIEFILE, "log/cookies1903");
+ curl_easy_setopt(ch, CURLOPT_COOKIEFILE, libtest_arg2);
curl_easy_perform(ch);
curl_easy_reset(ch);
curl_easy_setopt(ch, CURLOPT_URL, URL);
- curl_easy_setopt(ch, CURLOPT_COOKIEFILE, "log/cookies1903");
+ curl_easy_setopt(ch, CURLOPT_COOKIEFILE, libtest_arg2);
curl_easy_perform(ch);
cleanup:
diff --git a/tests/libtest/lib1905.c b/tests/libtest/lib1905.c
index 455814f76..bae975c99 100644
--- a/tests/libtest/lib1905.c
+++ b/tests/libtest/lib1905.c
@@ -55,8 +55,8 @@ int test(char *URL)
curl_easy_setopt(ch, CURLOPT_SHARE, sh);
curl_easy_setopt(ch, CURLOPT_URL, URL);
- curl_easy_setopt(ch, CURLOPT_COOKIEFILE, "log/cookies1905");
- curl_easy_setopt(ch, CURLOPT_COOKIEJAR, "log/cookies1905");
+ curl_easy_setopt(ch, CURLOPT_COOKIEFILE, libtest_arg2);
+ curl_easy_setopt(ch, CURLOPT_COOKIEJAR, libtest_arg2);
curl_multi_add_handle(cm, ch);
diff --git a/tests/libtest/lib1908.c b/tests/libtest/lib1908.c
index 1ef979c21..ff92dafb4 100644
--- a/tests/libtest/lib1908.c
+++ b/tests/libtest/lib1908.c
@@ -39,7 +39,7 @@ int test(char *URL)
if(hnd) {
curl_easy_setopt(hnd, CURLOPT_URL, URL);
curl_easy_setopt(hnd, CURLOPT_NOPROGRESS, 1L);
- curl_easy_setopt(hnd, CURLOPT_ALTSVC, "log/altsvc-1908");
+ curl_easy_setopt(hnd, CURLOPT_ALTSVC, libtest_arg2);
ret = curl_easy_perform(hnd);
if(!ret) {
diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
index 8862c46ce..dd4759ac4 100644
--- a/tests/libtest/lib506.c
+++ b/tests/libtest/lib506.c
@@ -24,8 +24,8 @@
#include "test.h"
#include "memdebug.h"
-static const char *HOSTHEADER = "Host: www.host.foo.com";
-static const char *JAR = "log/jar506";
+static const char * const HOSTHEADER = "Host: www.host.foo.com";
+#define JAR libtest_arg2
#define THREADS 2
/* struct containing data of a thread */
diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c
index 2d747ef39..9e761e8da 100644
--- a/tests/libtest/lib568.c
+++ b/tests/libtest/lib568.c
@@ -78,13 +78,13 @@ int test(char *URL)
free(stream_uri);
stream_uri = NULL;
- sdp = open("log/file568.txt", O_RDONLY);
+ sdp = open(libtest_arg2, O_RDONLY);
fstat(sdp, &file_info);
close(sdp);
- sdpf = fopen("log/file568.txt", "rb");
+ sdpf = fopen(libtest_arg2, "rb");
if(!sdpf) {
- fprintf(stderr, "can't open log/file568.txt\n");
+ fprintf(stderr, "can't open %s\n", libtest_arg2);
res = TEST_ERR_MAJOR_BAD;
goto test_cleanup;
}
diff --git a/tests/libtest/lib572.c b/tests/libtest/lib572.c
index aa723de89..f21037dc2 100644
--- a/tests/libtest/lib572.c
+++ b/tests/libtest/lib572.c
@@ -97,13 +97,13 @@ int test(char *URL)
stream_uri = NULL;
/* PUT style GET_PARAMETERS */
- params = open("log/file572.txt", O_RDONLY);
+ params = open(libtest_arg2, O_RDONLY);
fstat(params, &file_info);
close(params);
- paramsf = fopen("log/file572.txt", "rb");
+ paramsf = fopen(libtest_arg2, "rb");
if(!paramsf) {
- fprintf(stderr, "can't open log/file572.txt\n");
+ fprintf(stderr, "can't open %s\n", libtest_arg2);
res = TEST_ERR_MAJOR_BAD;
goto test_cleanup;
}
diff --git a/tests/libtest/lib654.c b/tests/libtest/lib654.c
index 449e220e8..96551637d 100644
--- a/tests/libtest/lib654.c
+++ b/tests/libtest/lib654.c
@@ -109,7 +109,7 @@ int test(char *URL)
hdrs = curl_slist_append(hdrs, "X-Test-Number: 654");
curl_mime_headers(part, hdrs, TRUE);
part = curl_mime_addpart(mime);
- curl_mime_filedata(part, "log/file654.txt");
+ curl_mime_filedata(part, libtest_arg2);
part = curl_mime_addpart(mime);
curl_mime_data_cb(part, (curl_off_t) -1, read_callback, NULL, free_callback,
&pooh);
diff --git a/tests/libtest/lib668.c b/tests/libtest/lib668.c
index 26c585885..35ab758f3 100644
--- a/tests/libtest/lib668.c
+++ b/tests/libtest/lib668.c
@@ -98,7 +98,7 @@ int test(char *URL)
curl_mime_name(part, "field3");
/* Regular file part sources early end of data can be detected because
the file size is known. In addition, and EOF test is performed. */
- curl_mime_filedata(part, "log/file668.txt");
+ curl_mime_filedata(part, libtest_arg2);
/* Bind mime data to its easy handle. */
test_setopt(easy, CURLOPT_MIMEPOST, mime);
diff --git a/tests/libtest/lib676.c b/tests/libtest/lib676.c
index 2051795f0..478d5f3a1 100644
--- a/tests/libtest/lib676.c
+++ b/tests/libtest/lib676.c
@@ -45,7 +45,7 @@ int test(char *URL)
test_setopt(curl, CURLOPT_URL, URL);
test_setopt(curl, CURLOPT_HEADER, 1L);
test_setopt(curl, CURLOPT_USERAGENT, "the-moo agent next generation");
- test_setopt(curl, CURLOPT_COOKIEFILE, "log/cookies676");
+ test_setopt(curl, CURLOPT_COOKIEFILE, libtest_arg2);
test_setopt(curl, CURLOPT_VERBOSE, 1L);
res = curl_easy_perform(curl);