projects
/
ccan
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ozlabs.org:ccan
[ccan]
/
ccan
/
tap
/
tap.c
diff --git
a/ccan/tap/tap.c
b/ccan/tap/tap.c
index 9f6d4d066a4e7068d16bc05659cb47fd680b3f6b..7c01e140d5c206c475957f439b47eb3462fff994 100644
(file)
--- 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
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)
#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
* 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;
const char *test_name, ...)
{
va_list ap;
@@
-170,7
+175,7
@@
_gen_result(int ok, const char *func, const char *file, unsigned int line,
printf("\n");
if(!ok)
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);
todo ? "(TODO) " : "", file, func, line);
free(local_test_name);
@@
-231,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 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;
failures, test_count);
}
UNLOCK;
@@
-239,7
+244,7
@@
_cleanup(void)
}
if(failures)
}
if(failures)
- _diag("Looks like you failed %d tests of %d.",
+ _diag("Looks like you failed %d tests of %d.",
failures, test_count);
UNLOCK;
failures, test_count);
UNLOCK;
@@
-259,7
+264,7
@@
_tap_init(void)
atexit(_cleanup);
/* stdout needs to be unbuffered so that the output appears
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;
with Test::Harness */
// setbuf(stdout, 0);
run_once = 1;
@@
-374,8
+379,8
@@
skip(unsigned int n, const char *fmt, ...)
while(n-- > 0) {
test_count++;
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");
}
skip_msg : "libtap():malloc() failed");
}
@@
-434,7
+439,7
@@
exit_status(void)
return r;
}
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;
that weren't run */
r = failures + e_tests - test_count;
UNLOCK;