summaryrefslogtreecommitdiffstats
path: root/tap
diff options
context:
space:
mode:
Diffstat (limited to 'tap')
-rw-r--r--tap/tap.c151
-rw-r--r--tap/tap.h65
-rw-r--r--tap/tests/diag/test.c4
-rw-r--r--tap/tests/fail/test.c4
-rw-r--r--tap/tests/ok/ok-hash/test.c8
-rw-r--r--tap/tests/ok/ok-numeric/test.c4
-rw-r--r--tap/tests/ok/ok/test.c4
-rw-r--r--tap/tests/pass/test.c4
-rw-r--r--tap/tests/plan/no-tests/test.c4
-rw-r--r--tap/tests/plan/no_plan/test.c4
-rw-r--r--tap/tests/plan/not-enough-tests/test.c4
-rw-r--r--tap/tests/plan/sane/test.c4
-rw-r--r--tap/tests/plan/skip_all/test.c4
-rw-r--r--tap/tests/plan/too-many-plans/test.c4
-rw-r--r--tap/tests/plan/too-many-tests/test.c4
-rw-r--r--tap/tests/skip/test.c12
-rw-r--r--tap/tests/todo/test.c6
17 files changed, 118 insertions, 172 deletions
diff --git a/tap/tap.c b/tap/tap.c
index 97c20e96..fb40736f 100644
--- a/tap/tap.c
+++ b/tap/tap.c
@@ -35,8 +35,8 @@ static int no_plan = 0;
35static int skip_all = 0; 35static int skip_all = 0;
36static int have_plan = 0; 36static int have_plan = 0;
37static unsigned int test_count = 0; /* Number of tests that have been run */ 37static unsigned int test_count = 0; /* Number of tests that have been run */
38static unsigned int e_tests = 0; /* Expected number of tests to run */ 38static unsigned int e_tests = 0; /* Expected number of tests to run */
39static unsigned int failures = 0; /* Number of tests that failed */ 39static unsigned int failures = 0; /* Number of tests that failed */
40static char *todo_msg = NULL; 40static char *todo_msg = NULL;
41static char *todo_msg_fixed = "libtap malloc issue"; 41static char *todo_msg_fixed = "libtap malloc issue";
42static int todo = 0; 42static int todo = 0;
@@ -45,13 +45,13 @@ static int test_died = 0;
45/* Encapsulate the pthread code in a conditional. In the absence of 45/* Encapsulate the pthread code in a conditional. In the absence of
46 libpthread the code does nothing */ 46 libpthread the code does nothing */
47#ifdef HAVE_LIBPTHREAD 47#ifdef HAVE_LIBPTHREAD
48#include <pthread.h> 48# include <pthread.h>
49static pthread_mutex_t M = PTHREAD_MUTEX_INITIALIZER; 49static pthread_mutex_t M = PTHREAD_MUTEX_INITIALIZER;
50# define LOCK pthread_mutex_lock(&M); 50# define LOCK pthread_mutex_lock(&M);
51# define UNLOCK pthread_mutex_unlock(&M); 51# define UNLOCK pthread_mutex_unlock(&M);
52#else 52#else
53# define LOCK 53# define LOCK
54# define UNLOCK 54# define UNLOCK
55#endif 55#endif
56 56
57static void _expected_tests(unsigned int); 57static void _expected_tests(unsigned int);
@@ -65,10 +65,8 @@ static void _cleanup(void);
65 * test_name -- the name of the test, may be NULL 65 * test_name -- the name of the test, may be NULL
66 * test_comment -- a comment to print afterwards, may be NULL 66 * test_comment -- a comment to print afterwards, may be NULL
67 */ 67 */
68unsigned int 68unsigned int _gen_result(int ok, const char *func, char *file, unsigned int line, char *test_name,
69_gen_result(int ok, const char *func, char *file, unsigned int line, 69 ...) {
70 char *test_name, ...)
71{
72 va_list ap; 70 va_list ap;
73 char *local_test_name = NULL; 71 char *local_test_name = NULL;
74 char *c; 72 char *c;
@@ -80,7 +78,7 @@ _gen_result(int ok, const char *func, char *file, unsigned int line,
80 78
81 /* Start by taking the test name and performing any printf() 79 /* Start by taking the test name and performing any printf()
82 expansions on it */ 80 expansions on it */
83 if(test_name != NULL) { 81 if (test_name != NULL) {
84 va_start(ap, test_name); 82 va_start(ap, test_name);
85 vasprintf(&local_test_name, test_name, ap); 83 vasprintf(&local_test_name, test_name, ap);
86 va_end(ap); 84 va_end(ap);
@@ -88,43 +86,46 @@ _gen_result(int ok, const char *func, char *file, unsigned int line,
88 /* Make sure the test name contains more than digits 86 /* Make sure the test name contains more than digits
89 and spaces. Emit an error message and exit if it 87 and spaces. Emit an error message and exit if it
90 does */ 88 does */
91 if(local_test_name) { 89 if (local_test_name) {
92 name_is_digits = 1; 90 name_is_digits = 1;
93 for(c = local_test_name; *c != '\0'; c++) { 91 for (c = local_test_name; *c != '\0'; c++) {
94 if(!isdigit(*c) && !isspace(*c)) { 92 if (!isdigit(*c) && !isspace(*c)) {
95 name_is_digits = 0; 93 name_is_digits = 0;
96 break; 94 break;
97 } 95 }
98 } 96 }
99 97
100 if(name_is_digits) { 98 if (name_is_digits) {
101 diag(" You named your test '%s'. You shouldn't use numbers for your test names.", local_test_name); 99 diag(
100 " You named your test '%s'. You shouldn't use numbers for your test names.",
101 local_test_name);
102 diag(" Very confusing."); 102 diag(" Very confusing.");
103 } 103 }
104 } 104 }
105 } 105 }
106 106
107 if(!ok) { 107 if (!ok) {
108 printf("not "); 108 printf("not ");
109 failures++; 109 failures++;
110 } 110 }
111 111
112 printf("ok %d", test_count); 112 printf("ok %d", test_count);
113 113
114 if(test_name != NULL) { 114 if (test_name != NULL) {
115 printf(" - "); 115 printf(" - ");
116 116
117 /* Print the test name, escaping any '#' characters it 117 /* Print the test name, escaping any '#' characters it
118 might contain */ 118 might contain */
119 if(local_test_name != NULL) { 119 if (local_test_name != NULL) {
120 flockfile(stdout); 120 flockfile(stdout);
121 for(c = local_test_name; *c != '\0'; c++) { 121 for (c = local_test_name; *c != '\0'; c++) {
122 if(*c == '#') 122 if (*c == '#') {
123 fputc('\\', stdout); 123 fputc('\\', stdout);
124 }
124 fputc((int)*c, stdout); 125 fputc((int)*c, stdout);
125 } 126 }
126 funlockfile(stdout); 127 funlockfile(stdout);
127 } else { /* vasprintf() failed, use a fixed message */ 128 } else { /* vasprintf() failed, use a fixed message */
128 printf("%s", todo_msg_fixed); 129 printf("%s", todo_msg_fixed);
129 } 130 }
130 } 131 }
@@ -136,17 +137,18 @@ _gen_result(int ok, const char *func, char *file, unsigned int line,
136 137
137 This is not counted as a failure, so decrement the counter if 138 This is not counted as a failure, so decrement the counter if
138 the test failed. */ 139 the test failed. */
139 if(todo) { 140 if (todo) {
140 printf(" # TODO %s", todo_msg ? todo_msg : todo_msg_fixed); 141 printf(" # TODO %s", todo_msg ? todo_msg : todo_msg_fixed);
141 if(!ok) 142 if (!ok) {
142 failures--; 143 failures--;
144 }
143 } 145 }
144 146
145 printf("\n"); 147 printf("\n");
146 148
147 if(!ok) 149 if (!ok) {
148 diag(" Failed %stest (%s:%s() at line %d)", 150 diag(" Failed %stest (%s:%s() at line %d)", todo ? "(TODO) " : "", file, func, line);
149 todo ? "(TODO) " : "", file, func, line); 151 }
150 152
151 free(local_test_name); 153 free(local_test_name);
152 154
@@ -161,18 +163,16 @@ _gen_result(int ok, const char *func, char *file, unsigned int line,
161 * Initialise the TAP library. Will only do so once, however many times it's 163 * Initialise the TAP library. Will only do so once, however many times it's
162 * called. 164 * called.
163 */ 165 */
164void 166void _tap_init(void) {
165_tap_init(void)
166{
167 static int run_once = 0; 167 static int run_once = 0;
168 168
169 LOCK; 169 LOCK;
170 170
171 if(!run_once) { 171 if (!run_once) {
172 atexit(_cleanup); 172 atexit(_cleanup);
173 173
174 /* stdout needs to be unbuffered so that the output appears 174 /* stdout needs to be unbuffered so that the output appears
175 in the same place relative to stderr output as it does 175 in the same place relative to stderr output as it does
176 with Test::Harness */ 176 with Test::Harness */
177 setbuf(stdout, 0); 177 setbuf(stdout, 0);
178 run_once = 1; 178 run_once = 1;
@@ -184,15 +184,13 @@ _tap_init(void)
184/* 184/*
185 * Note that there's no plan. 185 * Note that there's no plan.
186 */ 186 */
187int 187int plan_no_plan(void) {
188plan_no_plan(void)
189{
190 188
191 LOCK; 189 LOCK;
192 190
193 _tap_init(); 191 _tap_init();
194 192
195 if(have_plan != 0) { 193 if (have_plan != 0) {
196 fprintf(stderr, "You tried to plan twice!\n"); 194 fprintf(stderr, "You tried to plan twice!\n");
197 test_died = 1; 195 test_died = 1;
198 UNLOCK; 196 UNLOCK;
@@ -210,9 +208,7 @@ plan_no_plan(void)
210/* 208/*
211 * Note that the plan is to skip all tests 209 * Note that the plan is to skip all tests
212 */ 210 */
213int 211int plan_skip_all(char *reason) {
214plan_skip_all(char *reason)
215{
216 212
217 LOCK; 213 LOCK;
218 214
@@ -222,8 +218,9 @@ plan_skip_all(char *reason)
222 218
223 printf("1..0"); 219 printf("1..0");
224 220
225 if(reason != NULL) 221 if (reason != NULL) {
226 printf(" # Skip %s", reason); 222 printf(" # Skip %s", reason);
223 }
227 224
228 printf("\n"); 225 printf("\n");
229 226
@@ -235,22 +232,20 @@ plan_skip_all(char *reason)
235/* 232/*
236 * Note the number of tests that will be run. 233 * Note the number of tests that will be run.
237 */ 234 */
238int 235int plan_tests(unsigned int tests) {
239plan_tests(unsigned int tests)
240{
241 236
242 LOCK; 237 LOCK;
243 238
244 _tap_init(); 239 _tap_init();
245 240
246 if(have_plan != 0) { 241 if (have_plan != 0) {
247 fprintf(stderr, "You tried to plan twice!\n"); 242 fprintf(stderr, "You tried to plan twice!\n");
248 test_died = 1; 243 test_died = 1;
249 UNLOCK; 244 UNLOCK;
250 exit(255); 245 exit(255);
251 } 246 }
252 247
253 if(tests == 0) { 248 if (tests == 0) {
254 fprintf(stderr, "You said to run 0 tests! You've got to run something.\n"); 249 fprintf(stderr, "You said to run 0 tests! You've got to run something.\n");
255 test_died = 1; 250 test_died = 1;
256 UNLOCK; 251 UNLOCK;
@@ -266,9 +261,7 @@ plan_tests(unsigned int tests)
266 return 0; 261 return 0;
267} 262}
268 263
269unsigned int 264unsigned int diag(char *fmt, ...) {
270diag(char *fmt, ...)
271{
272 va_list ap; 265 va_list ap;
273 266
274 LOCK; 267 LOCK;
@@ -286,9 +279,7 @@ diag(char *fmt, ...)
286 return 0; 279 return 0;
287} 280}
288 281
289void 282void _expected_tests(unsigned int tests) {
290_expected_tests(unsigned int tests)
291{
292 283
293 LOCK; 284 LOCK;
294 285
@@ -298,9 +289,7 @@ _expected_tests(unsigned int tests)
298 UNLOCK; 289 UNLOCK;
299} 290}
300 291
301int 292int skip(unsigned int n, char *fmt, ...) {
302skip(unsigned int n, char *fmt, ...)
303{
304 va_list ap; 293 va_list ap;
305 char *skip_msg; 294 char *skip_msg;
306 295
@@ -310,11 +299,10 @@ skip(unsigned int n, char *fmt, ...)
310 asprintf(&skip_msg, fmt, ap); 299 asprintf(&skip_msg, fmt, ap);
311 va_end(ap); 300 va_end(ap);
312 301
313 while(n-- > 0) { 302 while (n-- > 0) {
314 test_count++; 303 test_count++;
315 printf("ok %d # skip %s\n", test_count, 304 printf("ok %d # skip %s\n", test_count,
316 skip_msg != NULL ? 305 skip_msg != NULL ? skip_msg : "libtap():malloc() failed");
317 skip_msg : "libtap():malloc() failed");
318 } 306 }
319 307
320 free(skip_msg); 308 free(skip_msg);
@@ -324,9 +312,7 @@ skip(unsigned int n, char *fmt, ...)
324 return 1; 312 return 1;
325} 313}
326 314
327void 315void todo_start(char *fmt, ...) {
328todo_start(char *fmt, ...)
329{
330 va_list ap; 316 va_list ap;
331 317
332 LOCK; 318 LOCK;
@@ -340,9 +326,7 @@ todo_start(char *fmt, ...)
340 UNLOCK; 326 UNLOCK;
341} 327}
342 328
343void 329void todo_end(void) {
344todo_end(void)
345{
346 330
347 LOCK; 331 LOCK;
348 332
@@ -352,28 +336,26 @@ todo_end(void)
352 UNLOCK; 336 UNLOCK;
353} 337}
354 338
355int 339int exit_status(void) {
356exit_status(void)
357{
358 int r; 340 int r;
359 341
360 LOCK; 342 LOCK;
361 343
362 /* If there's no plan, just return the number of failures */ 344 /* If there's no plan, just return the number of failures */
363 if(no_plan || !have_plan) { 345 if (no_plan || !have_plan) {
364 UNLOCK; 346 UNLOCK;
365 return failures; 347 return failures;
366 } 348 }
367 349
368 /* Ran too many tests? Return the number of tests that were run 350 /* Ran too many tests? Return the number of tests that were run
369 that shouldn't have been */ 351 that shouldn't have been */
370 if(e_tests < test_count) { 352 if (e_tests < test_count) {
371 r = test_count - e_tests; 353 r = test_count - e_tests;
372 UNLOCK; 354 UNLOCK;
373 return r; 355 return r;
374 } 356 }
375 357
376 /* Return the number of tests that failed + the number of tests 358 /* Return the number of tests that failed + the number of tests
377 that weren't run */ 359 that weren't run */
378 r = failures + e_tests - test_count; 360 r = failures + e_tests - test_count;
379 UNLOCK; 361 UNLOCK;
@@ -385,51 +367,46 @@ exit_status(void)
385 * Cleanup at the end of the run, produce any final output that might be 367 * Cleanup at the end of the run, produce any final output that might be
386 * required. 368 * required.
387 */ 369 */
388void 370void _cleanup(void) {
389_cleanup(void)
390{
391 371
392 LOCK; 372 LOCK;
393 373
394 /* If plan_no_plan() wasn't called, and we don't have a plan, 374 /* If plan_no_plan() wasn't called, and we don't have a plan,
395 and we're not skipping everything, then something happened 375 and we're not skipping everything, then something happened
396 before we could produce any output */ 376 before we could produce any output */
397 if(!no_plan && !have_plan && !skip_all) { 377 if (!no_plan && !have_plan && !skip_all) {
398 diag("Looks like your test died before it could output anything."); 378 diag("Looks like your test died before it could output anything.");
399 UNLOCK; 379 UNLOCK;
400 return; 380 return;
401 } 381 }
402 382
403 if(test_died) { 383 if (test_died) {
404 diag("Looks like your test died just after %d.", test_count); 384 diag("Looks like your test died just after %d.", test_count);
405 UNLOCK; 385 UNLOCK;
406 return; 386 return;
407 } 387 }
408 388
409
410 /* No plan provided, but now we know how many tests were run, and can 389 /* No plan provided, but now we know how many tests were run, and can
411 print the header at the end */ 390 print the header at the end */
412 if(!skip_all && (no_plan || !have_plan)) { 391 if (!skip_all && (no_plan || !have_plan)) {
413 printf("1..%d\n", test_count); 392 printf("1..%d\n", test_count);
414 } 393 }
415 394
416 if((have_plan && !no_plan) && e_tests < test_count) { 395 if ((have_plan && !no_plan) && e_tests < test_count) {
417 diag("Looks like you planned %d tests but ran %d extra.", 396 diag("Looks like you planned %d tests but ran %d extra.", e_tests, test_count - e_tests);
418 e_tests, test_count - e_tests);
419 UNLOCK; 397 UNLOCK;
420 return; 398 return;
421 } 399 }
422 400
423 if((have_plan || !no_plan) && e_tests > test_count) { 401 if ((have_plan || !no_plan) && e_tests > test_count) {
424 diag("Looks like you planned %d tests but only ran %d.", 402 diag("Looks like you planned %d tests but only ran %d.", e_tests, test_count);
425 e_tests, test_count);
426 UNLOCK; 403 UNLOCK;
427 return; 404 return;
428 } 405 }
429 406
430 if(failures) 407 if (failures) {
431 diag("Looks like you failed %d tests of %d.", 408 diag("Looks like you failed %d tests of %d.", failures, test_count);
432 failures, test_count); 409 }
433 410
434 UNLOCK; 411 UNLOCK;
435} 412}
diff --git a/tap/tap.h b/tap/tap.h
index 8ee525c8..0c550bfd 100644
--- a/tap/tap.h
+++ b/tap/tap.h
@@ -28,52 +28,51 @@
28 and requires the caller to add the final comma if they've omitted 28 and requires the caller to add the final comma if they've omitted
29 the optional arguments */ 29 the optional arguments */
30#ifdef __GNUC__ 30#ifdef __GNUC__
31# define ok(e, test, ...) ((e) ? \ 31# define ok(e, test, ...) \
32 _gen_result(1, __func__, __FILE__, __LINE__, \ 32 ((e) ? _gen_result(1, __func__, __FILE__, __LINE__, test, ##__VA_ARGS__) \
33 test, ## __VA_ARGS__) : \ 33 : _gen_result(0, __func__, __FILE__, __LINE__, test, ##__VA_ARGS__))
34 _gen_result(0, __func__, __FILE__, __LINE__, \
35 test, ## __VA_ARGS__))
36 34
37# define ok1(e) ((e) ? \ 35# define ok1(e) \
38 _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) : \ 36 ((e) ? _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) \
39 _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e)) 37 : _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e))
40 38
41# define pass(test, ...) ok(1, test, ## __VA_ARGS__); 39# define pass(test, ...) ok(1, test, ##__VA_ARGS__);
42# define fail(test, ...) ok(0, test, ## __VA_ARGS__); 40# define fail(test, ...) ok(0, test, ##__VA_ARGS__);
43 41
44# define skip_start(test, n, fmt, ...) \ 42# define skip_start(test, n, fmt, ...) \
45 do { \ 43 do { \
46 if((test)) { \ 44 if ((test)) { \
47 skip(n, fmt, ## __VA_ARGS__); \ 45 skip(n, fmt, ##__VA_ARGS__); \
48 continue; \ 46 continue; \
49 } 47 }
50#else /* __GNUC__ */ 48#else /* __GNUC__ */
51/* The original tap.h used to test if __STDC_VERSION__ >= 199901L here. This 49/* The original tap.h used to test if __STDC_VERSION__ >= 199901L here. This
52 * doesn't seem to work on HP-UX even though the code compile fine. I'm not 50 * doesn't seem to work on HP-UX even though the code compile fine. I'm not
53 * sure how to add an exception here for HP-UX so I just removed the check 51 * sure how to add an exception here for HP-UX so I just removed the check
54 * for now */ 52 * for now */
55# define ok(e, ...) ((e) ? \ 53# define ok(e, ...) \
56 _gen_result(1, __func__, __FILE__, __LINE__, \ 54 ((e) ? _gen_result(1, __func__, __FILE__, __LINE__, __VA_ARGS__) \
57 __VA_ARGS__) : \ 55 : _gen_result(0, __func__, __FILE__, __LINE__, __VA_ARGS__))
58 _gen_result(0, __func__, __FILE__, __LINE__, \
59 __VA_ARGS__))
60 56
61# define ok1(e) ((e) ? \ 57# define ok1(e) \
62 _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) : \ 58 ((e) ? _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) \
63 _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e)) 59 : _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e))
64 60
65# define pass(...) ok(1, __VA_ARGS__); 61# define pass(...) ok(1, __VA_ARGS__);
66# define fail(...) ok(0, __VA_ARGS__); 62# define fail(...) ok(0, __VA_ARGS__);
67 63
68# define skip_start(test, n, ...) \ 64# define skip_start(test, n, ...) \
69 do { \ 65 do { \
70 if((test)) { \ 66 if ((test)) { \
71 skip(n, __VA_ARGS__); \ 67 skip(n, __VA_ARGS__); \
72 continue; \ 68 continue; \
73 } 69 }
74#endif /* __GNUC__ */ 70#endif /* __GNUC__ */
75 71
76# define skip_end } while(0); 72#define skip_end \
73 } \
74 while (0) \
75 ;
77 76
78unsigned int _gen_result(int, const char *, char *, unsigned int, char *, ...); 77unsigned int _gen_result(int, const char *, char *, unsigned int, char *, ...);
79 78
diff --git a/tap/tests/diag/test.c b/tap/tests/diag/test.c
index 401db647..b0a5a4f5 100644
--- a/tap/tests/diag/test.c
+++ b/tap/tests/diag/test.c
@@ -28,9 +28,7 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 33
36 plan_tests(2); 34 plan_tests(2);
diff --git a/tap/tests/fail/test.c b/tap/tests/fail/test.c
index 621b6c29..18e16954 100644
--- a/tap/tests/fail/test.c
+++ b/tap/tests/fail/test.c
@@ -28,9 +28,7 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 33
36 rc = plan_tests(2); 34 rc = plan_tests(2);
diff --git a/tap/tests/ok/ok-hash/test.c b/tap/tests/ok/ok-hash/test.c
index 16be137a..82f65b08 100644
--- a/tap/tests/ok/ok-hash/test.c
+++ b/tap/tests/ok/ok-hash/test.c
@@ -28,9 +28,7 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 33
36 rc = plan_tests(4); 34 rc = plan_tests(4);
@@ -42,11 +40,11 @@ main(int argc, char *argv[])
42 rc = ok(1, "Test with one # hash"); 40 rc = ok(1, "Test with one # hash");
43 diag("Returned: %d", rc); 41 diag("Returned: %d", rc);
44 42
45 rc = ok(1, "Test with # two # hashes"); 43 rc = ok(1, "Test with # two # hashes");
46 diag("Returned: %d", rc); 44 diag("Returned: %d", rc);
47 45
48 rc = ok(1, "Test with ## back to back hashes"); 46 rc = ok(1, "Test with ## back to back hashes");
49 diag("Returned: %d", rc); 47 diag("Returned: %d", rc);
50 48
51 return exit_status(); 49 return exit_status();
52} 50}
diff --git a/tap/tests/ok/ok-numeric/test.c b/tap/tests/ok/ok-numeric/test.c
index 0e33a748..46113f49 100644
--- a/tap/tests/ok/ok-numeric/test.c
+++ b/tap/tests/ok/ok-numeric/test.c
@@ -28,9 +28,7 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 33
36 rc = plan_tests(3); 34 rc = plan_tests(3);
diff --git a/tap/tests/ok/ok/test.c b/tap/tests/ok/ok/test.c
index ae04f2e4..8ef0bcd8 100644
--- a/tap/tests/ok/ok/test.c
+++ b/tap/tests/ok/ok/test.c
@@ -28,9 +28,7 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 33
36 rc = plan_tests(5); 34 rc = plan_tests(5);
diff --git a/tap/tests/pass/test.c b/tap/tests/pass/test.c
index 39d8a7c1..73df20cb 100644
--- a/tap/tests/pass/test.c
+++ b/tap/tests/pass/test.c
@@ -28,9 +28,7 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 33
36 rc = plan_tests(2); 34 rc = plan_tests(2);
diff --git a/tap/tests/plan/no-tests/test.c b/tap/tests/plan/no-tests/test.c
index 78c5d371..f70ec8d3 100644
--- a/tap/tests/plan/no-tests/test.c
+++ b/tap/tests/plan/no-tests/test.c
@@ -28,9 +28,7 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 33
36 rc = plan_tests(0); 34 rc = plan_tests(0);
diff --git a/tap/tests/plan/no_plan/test.c b/tap/tests/plan/no_plan/test.c
index 5cffbdc2..4c25d5f2 100644
--- a/tap/tests/plan/no_plan/test.c
+++ b/tap/tests/plan/no_plan/test.c
@@ -28,9 +28,7 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 33
36 rc = plan_no_plan(); 34 rc = plan_no_plan();
diff --git a/tap/tests/plan/not-enough-tests/test.c b/tap/tests/plan/not-enough-tests/test.c
index a9ec64f2..eacc07eb 100644
--- a/tap/tests/plan/not-enough-tests/test.c
+++ b/tap/tests/plan/not-enough-tests/test.c
@@ -28,9 +28,7 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 33
36 rc = plan_tests(1); 34 rc = plan_tests(1);
diff --git a/tap/tests/plan/sane/test.c b/tap/tests/plan/sane/test.c
index 0843d3af..17bf8d16 100644
--- a/tap/tests/plan/sane/test.c
+++ b/tap/tests/plan/sane/test.c
@@ -28,9 +28,7 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 33
36 rc = plan_tests(1); 34 rc = plan_tests(1);
diff --git a/tap/tests/plan/skip_all/test.c b/tap/tests/plan/skip_all/test.c
index 31722da9..4e37e1ae 100644
--- a/tap/tests/plan/skip_all/test.c
+++ b/tap/tests/plan/skip_all/test.c
@@ -26,9 +26,7 @@
26 26
27#include "tap.h" 27#include "tap.h"
28 28
29int 29int main(int argc, char *argv[]) {
30main(int argc, char *argv[])
31{
32 unsigned int rc = 0; 30 unsigned int rc = 0;
33 31
34 rc = plan_skip_all("No good reason"); 32 rc = plan_skip_all("No good reason");
diff --git a/tap/tests/plan/too-many-plans/test.c b/tap/tests/plan/too-many-plans/test.c
index b189cb72..5f45bc48 100644
--- a/tap/tests/plan/too-many-plans/test.c
+++ b/tap/tests/plan/too-many-plans/test.c
@@ -28,9 +28,7 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 33
36 rc = plan_tests(1); 34 rc = plan_tests(1);
diff --git a/tap/tests/plan/too-many-tests/test.c b/tap/tests/plan/too-many-tests/test.c
index 0f724104..0b2ee161 100644
--- a/tap/tests/plan/too-many-tests/test.c
+++ b/tap/tests/plan/too-many-tests/test.c
@@ -28,9 +28,7 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 33
36 rc = plan_tests(5); 34 rc = plan_tests(5);
diff --git a/tap/tests/skip/test.c b/tap/tests/skip/test.c
index d8f3eafd..789812e2 100644
--- a/tap/tests/skip/test.c
+++ b/tap/tests/skip/test.c
@@ -28,29 +28,27 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 unsigned int side_effect = 0; 33 unsigned int side_effect = 0;
36 34
37 rc = plan_tests(4); 35 rc = plan_tests(4);
38 diag("Returned: %d", rc); 36 diag("Returned: %d", rc);
39 37
40 rc = ok(1 == 1, "1 equals 1"); /* Should always work */ 38 rc = ok(1 == 1, "1 equals 1"); /* Should always work */
41 diag("Returned: %d", rc); 39 diag("Returned: %d", rc);
42 40
43 do { 41 do {
44 if(1) { 42 if (1) {
45 rc = skip(1, "Testing skipping"); 43 rc = skip(1, "Testing skipping");
46 continue; 44 continue;
47 } 45 }
48 46
49 side_effect++; 47 side_effect++;
50 48
51 ok(side_effect == 1, "side_effect checked out"); 49 ok(side_effect == 1, "side_effect checked out");
52 50
53 } while(0); 51 } while (0);
54 52
55 diag("Returned: %d", rc); 53 diag("Returned: %d", rc);
56 54
diff --git a/tap/tests/todo/test.c b/tap/tests/todo/test.c
index ac6339a7..0cd2fb3f 100644
--- a/tap/tests/todo/test.c
+++ b/tap/tests/todo/test.c
@@ -28,16 +28,14 @@
28 28
29#include "tap.h" 29#include "tap.h"
30 30
31int 31int main(int argc, char *argv[]) {
32main(int argc, char *argv[])
33{
34 unsigned int rc = 0; 32 unsigned int rc = 0;
35 unsigned int side_effect = 0; 33 unsigned int side_effect = 0;
36 34
37 rc = plan_tests(5); 35 rc = plan_tests(5);
38 diag("Returned: %d", rc); 36 diag("Returned: %d", rc);
39 37
40 rc = ok(1 == 1, "1 equals 1"); /* Should always work */ 38 rc = ok(1 == 1, "1 equals 1"); /* Should always work */
41 diag("Returned: %d", rc); 39 diag("Returned: %d", rc);
42 40
43 todo_start("For testing purposes"); 41 todo_start("For testing purposes");