X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftap%2Ftap.c;h=9c92f7f21deb92c75ffe016f4c8e18a54b65f69b;hb=1d4d21dfb5ac43274afc125f132d196ce07f3177;hp=a5156aa194a748ecdf8822d49fde91ce7a0a257f;hpb=ac0e87d7ecf790c187ce3c5d837b971fdd016b57;p=ccan

diff --git a/ccan/tap/tap.c b/ccan/tap/tap.c
index a5156aa1..9c92f7f2 100644
--- a/ccan/tap/tap.c
+++ b/ccan/tap/tap.c
@@ -49,7 +49,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)
@@ -179,6 +179,9 @@ _gen_result(int ok, const char *func, const char *file, unsigned int line,
 
 	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;
@@ -260,7 +263,7 @@ _tap_init(void)
 		/* stdout needs to be unbuffered so that the output appears
 		   in the same place relative to stderr output as it does 
 		   with Test::Harness */
-		setbuf(stdout, 0);
+//		setbuf(stdout, 0);
 		run_once = 1;
 	}
 }