tdb2: rename internal hashfn and logfn to hash_fn and log_fn.

[ccan] / ccan / tap / tap.c

diff --git a/ccan/tap/tap.c b/ccan/tap/tap.c
index 857528a24429fa12e438e6844f356fa6fee40513..b7a84ac9900b398a40687e4e2fedd2bef3049518 100644 (file)
--- a/ccan/tap/tap.c
+++ b/ccan/tap/tap.c
@@ -23,10 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* FIXME: The real fix is an asprintf module. */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -49,7 +46,7 @@ static int test_pid;
 
 /* Encapsulate the pthread code in a conditional.  In the absence of
    libpthread the code does nothing */
-#ifdef HAVE_LIBPTHREAD
+#if HAVE_LIBPTHREAD
 #include <pthread.h>
 static pthread_mutex_t M = PTHREAD_MUTEX_INITIALIZER;
 # define LOCK pthread_mutex_lock(&M)
@@ -92,7 +89,7 @@ _diag(const char *fmt, ...)
  * test_comment -- a comment to print afterwards, may be NULL
  */
 unsigned int
-_gen_result(int ok, const char *func, const char *file, unsigned int line, 
+_gen_result(int ok, const char *func, const char *file, unsigned int line,
            const char *test_name, ...)
 {
        va_list ap;
@@ -118,7 +115,8 @@ _gen_result(int ok, const char *func, const char *file, unsigned int line,
                if(local_test_name) {
                        name_is_digits = 1;
                        for(c = local_test_name; *c != '\0'; c++) {
-                               if(!isdigit(*c) && !isspace(*c)) {
+                               if(!isdigit((unsigned char)*c)
+                                  && !isspace((unsigned char)*c)) {
                                        name_is_digits = 0;
                                        break;
                                }
@@ -172,13 +170,16 @@ _gen_result(int ok, const char *func, const char *file, unsigned int line,
        printf("\n");
 
        if(!ok)
-               _diag("    Failed %stest (%s:%s() at line %d)", 
+               _diag("    Failed %stest (%s:%s() at line %d)",
                      todo ? "(TODO) " : "", file, func, line);
 
        free(local_test_name);
 
        UNLOCK;
 
+       if (!ok && tap_fail_callback)
+               tap_fail_callback();
+
        /* We only care (when testing) that ok is positive, but here we
           specifically only want to return 1 or 0 */
        return ok ? 1 : 0;
@@ -230,7 +231,7 @@ _cleanup(void)
                _diag("Looks like you planned %d tests but only ran %d.",
                      e_tests, test_count);
                if(failures) {
-                       _diag("Looks like you failed %d tests of %d run.", 
+                       _diag("Looks like you failed %d tests of %d run.",
                              failures, test_count);
                }
                UNLOCK;
@@ -238,7 +239,7 @@ _cleanup(void)
        }
 
        if(failures)
-               _diag("Looks like you failed %d tests of %d.", 
+               _diag("Looks like you failed %d tests of %d.",
                      failures, test_count);
 
        UNLOCK;
@@ -258,7 +259,7 @@ _tap_init(void)
                atexit(_cleanup);
 
                /* stdout needs to be unbuffered so that the output appears
-                  in the same place relative to stderr output as it does 
+                  in the same place relative to stderr output as it does
                   with Test::Harness */
 //             setbuf(stdout, 0);
                run_once = 1;
@@ -373,8 +374,8 @@ skip(unsigned int n, const char *fmt, ...)
 
        while(n-- > 0) {
                test_count++;
-               printf("ok %d # skip %s\n", test_count, 
-                      skip_msg != NULL ? 
+               printf("ok %d # skip %s\n", test_count,
+                      skip_msg != NULL ?
                       skip_msg : "libtap():malloc() failed");
        }
 
@@ -433,7 +434,7 @@ exit_status(void)
                return r;
        }
 
-       /* Return the number of tests that failed + the number of tests 
+       /* Return the number of tests that failed + the number of tests
           that weren't run */
        r = failures + e_tests - test_count;
        UNLOCK;