diff options
| -rw-r--r-- | ccan/tap/_info | 2 | ||||
| -rw-r--r-- | ccan/tap/tap.c | 16 | ||||
| -rw-r--r-- | ccan/tap/tap.h | 7 | ||||
| -rw-r--r-- | ccan/tap/test/run.c | 2 |
4 files changed, 16 insertions, 11 deletions
diff --git a/ccan/tap/_info b/ccan/tap/_info index f6096974..baea996a 100644 --- a/ccan/tap/_info +++ b/ccan/tap/_info @@ -18,6 +18,8 @@ * * Based on the original libtap, Copyright (c) 2004 Nik Clayton. * + * License: BSD (2 clause) + * * Example: * #include <string.h> * #include <ccan/tap/tap.h> diff --git a/ccan/tap/tap.c b/ccan/tap/tap.c index 9f6d4d06..b7a84ac9 100644 --- a/ccan/tap/tap.c +++ b/ccan/tap/tap.c @@ -89,7 +89,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; @@ -170,7 +170,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); @@ -231,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; @@ -239,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; @@ -259,7 +259,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; @@ -374,8 +374,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"); } @@ -434,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; diff --git a/ccan/tap/tap.h b/ccan/tap/tap.h index 2c309740..06978e29 100644 --- a/ccan/tap/tap.h +++ b/ccan/tap/tap.h @@ -1,3 +1,5 @@ +#ifndef CCAN_TAP_H +#define CCAN_TAP_H /*- * Copyright (c) 2004 Nik Clayton * All rights reserved. @@ -89,7 +91,7 @@ void plan_tests(unsigned int tests); * int x = somefunc(); * if (x > 0) * pass("somefunc() returned a valid value"); - * else + * else * fail("somefunc() returned an invalid value"); */ # define pass(...) ok(1, __VA_ARGS__) @@ -167,7 +169,7 @@ void skip(unsigned int n, const char *fmt, ...) PRINTF_FMT(2, 3); * This way, should a test start to succeed unexpectedly, tools like prove(1) * will indicate this and you can move the test out of the todo block. This * is much more useful than simply commenting out (or '#if 0') the tests. - * + * * From the Test::More documentation: * If it's something the programmer hasn't done yet, use TODO. This is for * any code you haven't written yet, or bugs you have yet to fix, but want to @@ -251,3 +253,4 @@ void plan_skip_all(const char *reason); void (*tap_fail_callback)(void); #endif /* C99 or gcc */ +#endif /* CCAN_TAP_H */ diff --git a/ccan/tap/test/run.c b/ccan/tap/test/run.c index 37f26ae0..fb039a89 100644 --- a/ccan/tap/test/run.c +++ b/ccan/tap/test/run.c @@ -25,7 +25,7 @@ static void write_all(int fd, const void *data, size_t size) done = write(fd, data, size); if (done <= 0) _exit(1); - data += done; + data = (const char *)data + done; size -= done; } } |