endian: add constant versions.

[ccan] / ccan / tap / tap.h

diff --git a/ccan/tap/tap.h b/ccan/tap/tap.h
index 8c961983555dc4869ba0f6ebd11e79b3c86d0a8a..5b21ff756a89a9dd64c2caf61f2899fe65e5e272 100644 (file)
--- 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.
@@ -40,10 +42,6 @@
  */
 void plan_tests(unsigned int tests);
 
-#if (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) && !defined(__GNUC__)
-# error "Needs gcc or C99 compiler for variadic macros."
-#else
-
 /**
  * ok1 - Simple conditional test
  * @e: the expression which we expect to be true.
@@ -53,7 +51,7 @@ void plan_tests(unsigned int tests);
  * file name, line number, and the expression itself.
  *
  * Example:
- *     ok1(init_subsystem() == 1);
+ *     ok1(somefunc() == 1);
  */
 # define ok1(e) ((e) ?                                                 \
                 _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) : \
@@ -69,8 +67,8 @@ void plan_tests(unsigned int tests);
  * than simply the expression itself.
  *
  * Example:
- *     ok1(init_subsystem() == 1);
- *     ok(init_subsystem() == 0, "Second initialization should fail");
+ *     ok1(somefunc() == 1);
+ *     ok(somefunc() == 0, "Second somefunc() should fail");
  */
 # define ok(e, ...) ((e) ?                                             \
                     _gen_result(1, __func__, __FILE__, __LINE__,       \
@@ -86,11 +84,11 @@ void plan_tests(unsigned int tests);
  * branch and fail() in another.
  *
  * Example:
- *     x = do_something();
- *     if (!checkable(x) || check_value(x))
- *             pass("do_something() returned a valid value");
- *     else            
- *             fail("do_something() returned an invalid value");
+ *     int x = somefunc();
+ *     if (x > 0)
+ *             pass("somefunc() returned a valid value");
+ *     else
+ *             fail("somefunc() returned an invalid value");
  */
 # define pass(...) ok(1, __VA_ARGS__)
 
@@ -118,7 +116,7 @@ void plan_tests(unsigned int tests);
 # define skip_end } while(0)
 
 unsigned int _gen_result(int, const char *, const char *, unsigned int,
-   const char *, ...) PRINTF_ATTRIBUTE(5, 6);
+   const char *, ...) PRINTF_FMT(5, 6);
 
 /**
  * diag - print a diagnostic message (use instead of printf/fprintf)
@@ -130,7 +128,7 @@ unsigned int _gen_result(int, const char *, const char *, unsigned int,
  * Example:
  *     diag("Now running complex tests");
  */
-void diag(const char *fmt, ...) PRINTF_ATTRIBUTE(1, 2);
+void diag(const char *fmt, ...) PRINTF_FMT(1, 2);
 
 /**
  * skip - print a diagnostic message (use instead of printf/fprintf)
@@ -148,12 +146,12 @@ void diag(const char *fmt, ...) PRINTF_ATTRIBUTE(1, 2);
  *
  * Example:
  *     #ifdef HAVE_SOME_FEATURE
- *     ok1(test_some_feature());
+ *     ok1(somefunc());
  *     #else
  *     skip(1, "Don't have SOME_FEATURE");
  *     #endif
  */
-void skip(unsigned int n, const char *fmt, ...) PRINTF_ATTRIBUTE(2, 3);
+void skip(unsigned int n, const char *fmt, ...) PRINTF_FMT(2, 3);
 
 /**
  * todo_start - mark tests that you expect to fail.
@@ -167,18 +165,23 @@ void skip(unsigned int n, const char *fmt, ...) PRINTF_ATTRIBUTE(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
  *   put tests in your testing script (always a good idea).
  *
  * Example:
+ * static bool dwim(void)
+ * {
+ *     return false; // NYI
+ * }
+ * ...
  *     todo_start("dwim() not returning true yet");
  *     ok(dwim(), "Did what the user wanted");
  *     todo_end();
  */
-void todo_start(const char *fmt, ...) PRINTF_ATTRIBUTE(1, 2);
+void todo_start(const char *fmt, ...) PRINTF_FMT(1, 2);
 
 /**
  * todo_end - end of tests you expect to fail.
@@ -190,7 +193,7 @@ void todo_end(void);
 /**
  * exit_status - the value that main should return.
  *
- * For maximum compatability your test program should return a particular exit
+ * For maximum compatibility your test program should return a particular exit
  * code (ie. 0 if all tests were run, and every test which was expected to
  * succeed succeeded).
  *
@@ -213,7 +216,7 @@ int exit_status(void);
  * Example:
  *     plan_no_plan();
  *     while (random() % 2)
- *             ok1(some_test());
+ *             ok1(somefunc());
  *     exit(exit_status());
  */
 void plan_no_plan(void);
@@ -228,12 +231,21 @@ void plan_no_plan(void);
  * in the running kernel) use plan_skip_all() instead of plan_tests().
  *
  * Example:
- *     if (!have_some_feature) {
- *             plan_skip_all("Need some_feature support");
- *             exit(exit_status());
- *     }
+ *     #ifndef HAVE_SOME_FEATURE
+ *     plan_skip_all("Need SOME_FEATURE support");
+ *     exit(exit_status());
+ *     #else
  *     plan_tests(13);
+ *     ...
+ *     #endif
  */
 void plan_skip_all(const char *reason);
 
-#endif /* C99 or gcc */
+/**
+ * tap_fail_callback - function to call when we fail
+ *
+ * This can be used to ease debugging, or exit on the first failure.
+ */
+void (*tap_fail_callback)(void);
+
+#endif /* CCAN_TAP_H */