X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftap%2Ftap.c;h=b7a84ac9900b398a40687e4e2fedd2bef3049518;hp=5c475bcce97cd7232ca7a950fc0ceba20ada533b;hb=15cb319b3e5d07b70fb2fef7188c11c90d015de4;hpb=04160dbda10c78fbd4ee452d0af89d540e20b09a

diff --git a/ccan/tap/tap.c b/ccan/tap/tap.c
index 5c475bcc..b7a84ac9 100644
--- a/ccan/tap/tap.c
+++ b/ccan/tap/tap.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#define _GNU_SOURCE
+#include "config.h"
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -39,14 +39,14 @@ static unsigned int test_count = 0; /* Number of tests that have been run */
 static unsigned int e_tests = 0; /* Expected number of tests to run */
 static unsigned int failures = 0; /* Number of tests that failed */
 static char *todo_msg = NULL;
-static char *todo_msg_fixed = "libtap malloc issue";
+static const char *todo_msg_fixed = "libtap malloc issue";
 static int todo = 0;
 static int test_died = 0;
 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)
@@ -65,7 +65,7 @@ _expected_tests(unsigned int tests)
 }
 
 static void
-diagv(char *fmt, va_list ap)
+diagv(const char *fmt, va_list ap)
 {
 	fputs("# ", stdout);
 	vfprintf(stdout, fmt, ap);
@@ -73,7 +73,7 @@ diagv(char *fmt, va_list ap)
 }
 
 static void
-_diag(char *fmt, ...)
+_diag(const char *fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
@@ -89,8 +89,8 @@ _diag(char *fmt, ...)
  * test_comment -- a comment to print afterwards, may be NULL
  */
 unsigned int
-_gen_result(int ok, const char *func, char *file, unsigned int line, 
-	    char *test_name, ...)
+_gen_result(int ok, const char *func, const char *file, unsigned int line,
+	    const char *test_name, ...)
 {
 	va_list ap;
 	char *local_test_name = NULL;
@@ -115,7 +115,8 @@ _gen_result(int ok, const char *func, 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;
 				}
@@ -169,13 +170,16 @@ _gen_result(int ok, const char *func, 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;
@@ -227,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;
@@ -235,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;
@@ -255,9 +259,9 @@ _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);
+//		setbuf(stdout, 0);
 		run_once = 1;
 	}
 }
@@ -290,7 +294,7 @@ plan_no_plan(void)
  * Note that the plan is to skip all tests
  */
 void
-plan_skip_all(char *reason)
+plan_skip_all(const char *reason)
 {
 
 	LOCK;
@@ -342,7 +346,7 @@ plan_tests(unsigned int tests)
 }
 
 void
-diag(char *fmt, ...)
+diag(const char *fmt, ...)
 {
 	va_list ap;
 
@@ -356,7 +360,7 @@ diag(char *fmt, ...)
 }
 
 void
-skip(unsigned int n, char *fmt, ...)
+skip(unsigned int n, const char *fmt, ...)
 {
 	va_list ap;
 	char *skip_msg;
@@ -370,8 +374,8 @@ skip(unsigned int n, 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");
 	}
 
@@ -381,7 +385,7 @@ skip(unsigned int n, char *fmt, ...)
 }
 
 void
-todo_start(char *fmt, ...)
+todo_start(const char *fmt, ...)
 {
 	va_list ap;
 
@@ -430,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;