lib-test: more delicate *assert() behaviour when doing fatal tests

We shouldn't be i_asserting ourselves when we're in the state of wanting a
test to fail. Therefore instead test_assert to get the assert message, and
ensure that the success flag is cleared to get the FAILED at the end.

Signed-off-by: Phil Carmody <phil@dovecot.fi>

diff --git a/src/lib-test/test-common.c b/src/lib-test/test-common.c
index ad1badef16aca1b266e37e53f4835f3f1fff3a65..81c7d7464141d918706c0815befc807bad46237b 100644 (file)
--- a/src/lib-test/test-common.c
+++ b/src/lib-test/test-common.c
@@ -9,6 +9,10 @@
 
 #include <setjmp.h> /* for fatal tests */
 
+/* To test the firing of i_assert, we need non-local jumps, i.e. setjmp */
+static volatile bool expecting_fatal = FALSE;
+static jmp_buf fatal_jmpbuf;
+
 #define OUT_NAME_ALIGN 70
 
 static char *test_prefix;
@@ -145,9 +149,12 @@ void test_istream_set_size(struct istream *input, uoff_t size)
 
 void test_begin(const char *name)
 {
-       i_assert(test_prefix == NULL);
-       test_prefix = i_strdup(name);
        test_success = TRUE;
+       if (!expecting_fatal)
+               i_assert(test_prefix == NULL);
+       else
+               test_assert((test_success = (test_prefix == NULL)));
+       test_prefix = i_strdup(name);
 }
 
 bool test_has_failed(void)
@@ -185,7 +192,10 @@ test_dump_rand_state(void)
 
 void test_end(void)
 {
-       i_assert(test_prefix != NULL);
+       if (!expecting_fatal)
+               i_assert(test_prefix != NULL);
+       else
+               test_assert(test_prefix != NULL);
 
        test_out("", test_success);
        if (!test_success)
@@ -260,10 +270,6 @@ test_error_handler(const struct failure_context *ctx,
        test_success = FALSE;
 }
 
-/* To test the firing of i_assert, we need non-local jumps, i.e. setjmp */
-static volatile bool expecting_fatal = FALSE;
-static jmp_buf fatal_jmpbuf;
-
 static void ATTR_FORMAT(2, 0) ATTR_NORETURN
 test_fatal_handler(const struct failure_context *ctx,
                   const char *format, va_list args)