Improved "expected assertion failure" message in testdriver.

[pdclib] / functions / assert.c

diff --git a/functions/assert.c b/functions/assert.c
index e1a2dece92e92436cf9fb9d9fddb9dff44abe33c..349570c70b5a00ee1b075c14e83ff047f26aed0c 100644 (file)
--- a/functions/assert.c
+++ b/functions/assert.c
@@ -7,7 +7,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifndef _PDCLIB_AUX_H
+#define _PDCLIB_AUX_H _PDCLIB_AUX_H
 #include <_PDCLIB_aux.h>
+#endif
 
 #if _PDCLIB_C_VERSION == 99
 void _PDCLIB_assert( char const * const message1, char const * const function, char const * const message2 )
@@ -28,12 +31,38 @@ void _PDCLIB_assert( char const * const message )
 
 #ifdef TEST
 #include <_PDCLIB_test.h>
+#include <signal.h>
+
+static int rc = 0;
+static int EXPECTED_ABORT = 0;
+static int UNEXPECTED_ABORT = 1;
+
+void aborthandler( int signal )
+{
+    TESTCASE( ! EXPECTED_ABORT );
+    exit( rc );
+}
+
+#define NDEBUG
+#include <assert.h>
+
+int disabled_test()
+{
+    int i = 0;
+    assert( i == 0 ); /* NDEBUG set, condition met */
+    assert( i == 1 ); /* NDEBUG set, condition fails */
+    return i;
+}
+
+#undef NDEBUG
+#include <assert.h>
 
 int main()
 {
-    int NO_TESTDRIVER = 0;
     BEGIN_TESTS;
-    TESTCASE( NO_TESTDRIVER );
+    TESTCASE( signal( SIGABRT, &aborthandler ) != SIG_ERR );
+    assert( UNEXPECTED_ABORT ); /* NDEBUG not set, condition met */
+    assert( EXPECTED_ABORT ); /* NDEBUG not set, condition fails - should abort */
     return TEST_RESULTS;
 }