From 6b27e3251eb6b3374751cdcec4015b4ee1026e0e Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 8 Jun 2020 10:04:55 +0200 Subject: libtest: Support custom scope messages via fixture Update #3199. --- testsuites/libtests/ttest01/init.c | 2 +- testsuites/libtests/ttest01/test-fixture.c | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) (limited to 'testsuites/libtests') diff --git a/testsuites/libtests/ttest01/init.c b/testsuites/libtests/ttest01/init.c index a30211317e..1763a21616 100644 --- a/testsuites/libtests/ttest01/init.c +++ b/testsuites/libtests/ttest01/init.c @@ -183,7 +183,7 @@ run_initialize(void) } static const char expected_final[] = "Z:ttest01:C:342:N:1316:F:791:D:0.687999\n" -"Y:ReportHash:SHA256:d4c293b499e6e557afcf6123cb604e8976cc5b987021f1f8c9f6193fc38a386e\n"; +"Y:ReportHash:SHA256:efd7b69ac3ec0cac31fa147008bba87a077e6d53c0cfb8a836a4de2ae90ecc27\n"; static void run_finalize(void) diff --git a/testsuites/libtests/ttest01/test-fixture.c b/testsuites/libtests/ttest01/test-fixture.c index 60c3be1afb..c3515c320a 100644 --- a/testsuites/libtests/ttest01/test-fixture.c +++ b/testsuites/libtests/ttest01/test-fixture.c @@ -43,10 +43,18 @@ teardown(void *ctx) T_log(T_QUIET, "teardown end"); } +static void +scope(void *ctx, char *buf, size_t n) +{ + + strlcpy(buf, "/More", n); +} + static const T_fixture fixture = { .setup = setup, .stop = stop, .teardown = teardown, + .scope = scope, .initial_context = &initial_value }; @@ -62,18 +70,18 @@ T_TEST_CASE_FIXTURE(fixture, &fixture) T_TEST_OUTPUT(fixture, "B:fixture\n" "L:setup begin\n" -"P:0:0:UI1:test-fixture.c:13\n" -"P:1:0:UI1:test-fixture.c:14\n" -"P:2:0:UI1:test-fixture.c:18\n" +"P:0:0:UI1/More:test-fixture.c:13\n" +"P:1:0:UI1/More:test-fixture.c:14\n" +"P:2:0:UI1/More:test-fixture.c:18\n" "L:setup end\n" -"P:3:0:UI1:test-fixture.c:55\n" -"F:4:0:UI1:test-fixture.c:56:test fails and we stop the test case\n" +"P:3:0:UI1/More:test-fixture.c:63\n" +"F:4:0:UI1/More:test-fixture.c:64:test fails and we stop the test case\n" "L:stop begin\n" -"P:5:0:UI1:test-fixture.c:28\n" +"P:5:0:UI1/More:test-fixture.c:28\n" "L:stop end\n" "L:teardown begin\n" -"P:6:0:UI1:test-fixture.c:40\n" -"P:7:0:UI1:test-fixture.c:42\n" +"P:6:0:UI1/More:test-fixture.c:40\n" +"P:7:0:UI1/More:test-fixture.c:42\n" "L:teardown end\n" "E:fixture:N:8:F:1:D:0.001000\n"); -- cgit v1.2.3