luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GHA/http3-linux: build out-of-tree, make test2502 support it

Browse Source 
To sync with the rest of core workflows.

Also fixup test2502 failing for out-of-tree builds due to:
```
== Info: error reading ca cert file ./certs/EdelCurlRoot-ca.cacert (Error while reading file.)
```
Ref: https://github.com/curl/curl/actions/runs/13525575035/job/37795171282?pr=16480#step:23:3608

Cherry-picked from #16480
Closes #16481
This commit is contained in:
Viktor Szakats 2025-02-25 17:35:18 +01:00
parent 756a80e5c6
commit 2a892173b1
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/data/test2502
View File

@ -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 https://%HOSTIP:%HTTP3PORT/path/%TESTNUMBER %HOSTIP %HTTP3PORT %SRCDIR/certs/EdelCurlRoot-ca.cacert
</command> </command>
</client> </client>

4
tests/libtest/first.c
View File

@ -75,6 +75,7 @@ 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;
@ -201,6 +202,9 @@ 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);

2
tests/libtest/lib2502.c
View File

@ -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, "./certs/EdelCurlRoot-ca.cacert"); easy_setopt(curl[i], CURLOPT_CAINFO, libtest_arg4);
/* 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 */

1
tests/libtest/test.h
View File

@ -65,6 +65,7 @@
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[4] 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;