From d702c9f47d8b9b393316e0c6b54fca8c26f424a1 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Sat, 18 Jul 2020 14:41:36 +0200 Subject: libtest: Make check message optional This macro magic is in line with C11 and C++11, but limits the maximum count of arguments. Update #3199. --- testsuites/libtests/ttest01/init.c | 4 ++-- testsuites/libtests/ttest01/test-checks.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) (limited to 'testsuites') diff --git a/testsuites/libtests/ttest01/init.c b/testsuites/libtests/ttest01/init.c index a5df3932f7..35b7023385 100644 --- a/testsuites/libtests/ttest01/init.c +++ b/testsuites/libtests/ttest01/init.c @@ -182,8 +182,8 @@ run_initialize(void) T_set_putchar(censor_putchar, ctx, &ctx->putchar, &ctx->putchar_arg); } -static const char expected_final[] = "Z:ttest01:C:342:N:1329:F:791:D:0.687999\n" -"Y:ReportHash:SHA256:e5c3847558c805663117be13ef27fd89579f595148b8515c42a38bd1b9dd79c2\n"; +static const char expected_final[] = "Z:ttest01:C:343:N:1335:F:795:D:0.689999\n" +"Y:ReportHash:SHA256:f018ab0c9ddf5c5bc0ba8377492dc52205f9b63146c787fb669222e346c65d0f\n"; static void run_finalize(void) diff --git a/testsuites/libtests/ttest01/test-checks.c b/testsuites/libtests/ttest01/test-checks.c index d3ce67eeb5..fa5591121e 100644 --- a/testsuites/libtests/ttest01/test-checks.c +++ b/testsuites/libtests/ttest01/test-checks.c @@ -2880,6 +2880,18 @@ T_TEST_CASE(check_lt_sz) T_assert_lt_sz((size_t)12, (size_t)12); } +T_TEST_CASE(check_false_no_fmt) +{ + T_false(false); + T_false(true); + T_quiet_false(false); + T_quiet_false(true); + T_step_false(2, false); + T_step_false(3, true); + T_assert_false(false); + T_assert_false(true); +} + #include "t-self-test.h" T_TEST_OUTPUT(step_assert_true, @@ -5383,6 +5395,17 @@ T_TEST_OUTPUT(check_lt_sz, "F:5:0:UI1:test-checks.c:2880:12 < 12\n" "E:check_lt_sz:N:6:F:4:D:0.001000\n"); +T_TEST_OUTPUT(check_false_no_fmt, +"B:check_false_no_fmt\n" +"P:0:0:UI1:test-checks.c:2885\n" +"F:1:0:UI1:test-checks.c:2886\n" +"F:*:0:UI1:test-checks.c:2888\n" +"P:2:0:UI1:test-checks.c:2889\n" +"F:3:0:UI1:test-checks.c:2890\n" +"P:4:0:UI1:test-checks.c:2891\n" +"F:5:0:UI1:test-checks.c:2892\n" +"E:check_false_no_fmt:N:6:F:4:D:0.001000\n"); + /* * The license is at the end of the file to be able to use the test code and * output in examples in the documentation. This is also the reason for the -- cgit v1.2.3