tests: fix lib tests to run with a dynamic log directory

Ref: #10818

tests/data/test1903

@@ -33,7 +33,7 @@ CURLOPT_COOKIEFILE then reset then set again
 lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER %LOGDIR/cookies%TESTNUMBER
 </command>
 <file name="%LOGDIR/cookies%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File

tests/data/test1905

@@ -33,7 +33,7 @@ CURLOPT_COOKIELIST set to "FLUSH" of a shared cookie object
 lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER %LOGDIR/cookies%TESTNUMBER
 </command>
 <features>
 cookies

tests/data/test1908

@@ -51,7 +51,7 @@ lib%TESTNUMBER
 </tool>
 
 <command>
-%HOSTIP:%HTTPPORT/%TESTNUMBER
+%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/altsvc-%TESTNUMBER
 </command>
 </client>
 

tests/data/test506

@@ -74,7 +74,7 @@ TZ=GMT
 lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/jar%TESTNUMBER
 </command>
 </client>
 

tests/data/test568

@@ -58,7 +58,7 @@ lib%TESTNUMBER
 RTSP Announce (PUT and POST style) test
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt
 </command>
 # file written before test command runs
 <file name="%LOGDIR/file%TESTNUMBER.txt">

tests/data/test572

@@ -73,7 +73,7 @@ lib%TESTNUMBER
 RTSP GET_PARAMETER (Put/Heartbeat/Post)
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt
 </command>
 # file written before test command runs
 <file name="%LOGDIR/file%TESTNUMBER.txt">

tests/data/test654

@@ -54,7 +54,7 @@ lib%TESTNUMBER
 HTTP duplicate easy handle with mime data
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">
 This is data from a file

tests/data/test668

@@ -47,7 +47,7 @@ lib%TESTNUMBER
 HTTP mimepost early end of data detection
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">
 This is data from a file

tests/data/test676

@@ -44,7 +44,7 @@ Content-Type: text/html
 
 # Client-side
 <client>
-<file name="%LOGDIR/cookies676">
+<file name="%LOGDIR/cookies%TESTNUMBER">
 %HOSTIP	TRUE	/we/want/	FALSE	2118138987	proven	yes
 </file>
 <server>
@@ -59,7 +59,7 @@ lib%TESTNUMBER
 verify setting CURLOPT_COOKIEFILE to NULL again
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER %LOGDIR/cookies676
 </command>
 <features>
 cookies

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:

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);
 

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) {

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 */

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;
   }

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;
   }

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);

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);

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);