X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftap%2Ftap.c;h=6d3ba0db18923a3eadacdad294cbe1d38ef69884;hp=a5156aa194a748ecdf8822d49fde91ce7a0a257f;hb=39dc9e4612339af669e934c47500605f826a2bb4;hpb=3c81225fc0a4fb99d10282ebf11b7ec6ae1eabdd

diff --git a/ccan/tap/tap.c b/ccan/tap/tap.c
index a5156aa1..6d3ba0db 100644
--- 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)
@@ -179,6 +176,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 +260,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;
 	}
 }