Improved "expected assertion failure" message in testdriver.

[pdclib] / functions / assert.c

diff --git a/functions/assert.c b/functions/assert.c
index 3e887d9360c6cd5326cff65d11d085f032cff212..349570c70b5a00ee1b075c14e83ff047f26aed0c 100644 (file)
--- a/functions/assert.c
+++ b/functions/assert.c
@@ -1,17 +1,69 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
+/* _PDCLIB_assert( char * )
+
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
-__assert( char const * const expression, char const * const file,
- char const * const function, int const line )
+#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 )
 {
-    fprintf(stderr, "Assertion failed: %s, function %s, file %s, line %d.\n",
-                    expression, function, file, line );
+    fputs( message1, stderr );
+    fputs( function, stderr );
+    fputs( message2, stderr );
     abort();
 }
+#else
+void _PDCLIB_assert( char const * const message )
+{
+    fputs( message, stderr );
+    abort();
+}
+#endif
+
+
+#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()
+{
+    BEGIN_TESTS;
+    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;
+}
+
+#endif