Skip to content

Commit

Permalink
QLOG: QUIC MULTISTREAM TEST: Pass script name to QLOG
Browse files Browse the repository at this point in the history
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from #22037)
  • Loading branch information
hlandau committed Feb 2, 2024
1 parent fb1a0bb commit b7c7997
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions test/quic_multistream_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -664,12 +664,14 @@ static void helper_cleanup(struct helper *h)
#endif
}

static int helper_init(struct helper *h, int free_order, int blocking,
static int helper_init(struct helper *h, const char *script_name,
int free_order, int blocking,
int need_injector)
{
struct in_addr ina = {0};
QUIC_TSERVER_ARGS s_args = {0};
union BIO_sock_info_u info;
char title[128];

memset(h, 0, sizeof(*h));
h->c_fd = -1;
Expand Down Expand Up @@ -775,6 +777,11 @@ static int helper_init(struct helper *h, int free_order, int blocking,
if (!TEST_ptr(h->c_ctx = SSL_CTX_new(OSSL_QUIC_client_method())))
goto err;

/* Set title for QLOG purposes. */
snprintf(title, sizeof(title), "quic_multistream_test: %s", script_name);
if (!TEST_true(ossl_quic_set_diag_title(h->c_ctx, title)))
goto err;

if (!TEST_ptr(h->c_conn = SSL_new(h->c_ctx)))
goto err;

Expand Down Expand Up @@ -2055,7 +2062,8 @@ static int run_script(const struct script_op *script,
int testresult = 0;
struct helper h;

if (!TEST_true(helper_init(&h, free_order, blocking, 1)))
if (!TEST_true(helper_init(&h, script_name,
free_order, blocking, 1)))
goto out;

if (!TEST_true(run_script_worker(&h, script, script_name, -1)))
Expand Down

0 comments on commit b7c7997

Please sign in to comment.