Revert "try to fix test2502 for out-of-tree"
This reverts commit 37e0f1dff5.
This commit is contained in:
parent
890a460e9a
commit
f57d540c64
@ -59,7 +59,7 @@ lib%TESTNUMBER
|
|||||||
HTTP GET multiple over HTTP/3
|
HTTP GET multiple over HTTP/3
|
||||||
</name>
|
</name>
|
||||||
<command>
|
<command>
|
||||||
https://%HOSTIP:%HTTP3PORT/path/%TESTNUMBER %HOSTIP %HTTP3PORT %SRCDIR/certs/EdelCurlRoot-ca.cacert
|
https://%HOSTIP:%HTTP3PORT/path/%TESTNUMBER %HOSTIP %HTTP3PORT
|
||||||
</command>
|
</command>
|
||||||
</client>
|
</client>
|
||||||
|
|
||||||
|
|||||||
@ -75,7 +75,6 @@ void wait_ms(int ms)
|
|||||||
|
|
||||||
char *libtest_arg2 = NULL;
|
char *libtest_arg2 = NULL;
|
||||||
char *libtest_arg3 = NULL;
|
char *libtest_arg3 = NULL;
|
||||||
char *libtest_arg4 = NULL;
|
|
||||||
int test_argc;
|
int test_argc;
|
||||||
char **test_argv;
|
char **test_argv;
|
||||||
|
|
||||||
@ -202,9 +201,6 @@ int main(int argc, char **argv)
|
|||||||
if(argc > (basearg + 2))
|
if(argc > (basearg + 2))
|
||||||
libtest_arg3 = argv[basearg + 2];
|
libtest_arg3 = argv[basearg + 2];
|
||||||
|
|
||||||
if(argc > (basearg + 2))
|
|
||||||
libtest_arg4 = argv[basearg + 3];
|
|
||||||
|
|
||||||
URL = argv[basearg]; /* provide this to the rest */
|
URL = argv[basearg]; /* provide this to the rest */
|
||||||
|
|
||||||
fprintf(stderr, "URL: %s\n", URL);
|
fprintf(stderr, "URL: %s\n", URL);
|
||||||
|
|||||||
@ -77,7 +77,7 @@ CURLcode test(char *URL)
|
|||||||
/* go http2 */
|
/* go http2 */
|
||||||
easy_setopt(curl[i], CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_3ONLY);
|
easy_setopt(curl[i], CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_3ONLY);
|
||||||
easy_setopt(curl[i], CURLOPT_CONNECTTIMEOUT_MS, (long)5000);
|
easy_setopt(curl[i], CURLOPT_CONNECTTIMEOUT_MS, (long)5000);
|
||||||
easy_setopt(curl[i], CURLOPT_CAINFO, libtest_arg4);
|
easy_setopt(curl[i], CURLOPT_CAINFO, "./certs/EdelCurlRoot-ca.cacert");
|
||||||
/* wait for first connection established to see if we can share it */
|
/* wait for first connection established to see if we can share it */
|
||||||
easy_setopt(curl[i], CURLOPT_PIPEWAIT, 1L);
|
easy_setopt(curl[i], CURLOPT_PIPEWAIT, 1L);
|
||||||
/* go verbose */
|
/* go verbose */
|
||||||
|
|||||||
@ -65,7 +65,6 @@
|
|||||||
|
|
||||||
extern char *libtest_arg2; /* set by first.c to the argv[2] or NULL */
|
extern char *libtest_arg2; /* set by first.c to the argv[2] or NULL */
|
||||||
extern char *libtest_arg3; /* set by first.c to the argv[3] or NULL */
|
extern char *libtest_arg3; /* set by first.c to the argv[3] or NULL */
|
||||||
extern char *libtest_arg4; /* set by first.c to the argv[3] or NULL */
|
|
||||||
|
|
||||||
/* argc and argv as passed in to the main() function */
|
/* argc and argv as passed in to the main() function */
|
||||||
extern int test_argc;
|
extern int test_argc;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user