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

diff --git a/ccan/tap/tap.c b/ccan/tap/tap.c
index 6d3ba0db..bf8a276c 100644
--- a/ccan/tap/tap.c
+++ b/ccan/tap/tap.c
@@ -45,8 +45,13 @@ 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 */
-#if HAVE_LIBPTHREAD
+   libpthread the code does nothing.
+
+   If you have multiple threads calling ok() etc. at the same time you would
+   need this, but in that case your test numbers will be random and I'm not
+   sure it makes sense. --RR
+*/
+#ifdef WANT_PTHREAD
 #include <pthread.h>
 static pthread_mutex_t M = PTHREAD_MUTEX_INITIALIZER;
 # define LOCK pthread_mutex_lock(&M)
@@ -89,7 +94,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;
@@ -115,7 +120,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;
 				}
@@ -169,7 +175,7 @@ _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);
@@ -230,7 +236,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 +244,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 +264,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 +379,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");
 	}
 
@@ -412,8 +418,8 @@ todo_end(void)
 	UNLOCK;
 }
 
-int
-exit_status(void)
+static int
+exit_status_(void)
 {
 	int r;
 
@@ -433,10 +439,19 @@ 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;
 
 	return r;
 }
+
+int
+exit_status(void)
+{
+	int r = exit_status_();
+	if (r > 255)
+		r = 255;
+	return r;
+}