|
@@ -23,8 +23,8 @@
|
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
*/
|
|
|
|
|
|
-#ifndef _TINYTEST_MACROS_H
|
|
|
-#define _TINYTEST_MACROS_H
|
|
|
+#ifndef TINYTEST_MACROS_H_INCLUDED_
|
|
|
+#define TINYTEST_MACROS_H_INCLUDED_
|
|
|
|
|
|
/* Helpers for defining statement-like macros */
|
|
|
#define TT_STMT_BEGIN do {
|
|
@@ -51,30 +51,30 @@
|
|
|
/* Announce a non-failure if we're verbose. */
|
|
|
#define TT_BLATHER(args) \
|
|
|
TT_STMT_BEGIN \
|
|
|
- if (_tinytest_get_verbosity()>1) TT_DECLARE(" OK", args); \
|
|
|
+ if (tinytest_get_verbosity_()>1) TT_DECLARE(" OK", args); \
|
|
|
TT_STMT_END
|
|
|
|
|
|
#define TT_DIE(args) \
|
|
|
TT_STMT_BEGIN \
|
|
|
- _tinytest_set_test_failed(); \
|
|
|
+ tinytest_set_test_failed_(); \
|
|
|
TT_GRIPE(args); \
|
|
|
TT_EXIT_TEST_FUNCTION; \
|
|
|
TT_STMT_END
|
|
|
|
|
|
#define TT_FAIL(args) \
|
|
|
TT_STMT_BEGIN \
|
|
|
- _tinytest_set_test_failed(); \
|
|
|
+ tinytest_set_test_failed_(); \
|
|
|
TT_GRIPE(args); \
|
|
|
TT_STMT_END
|
|
|
|
|
|
/* Fail and abort the current test for the reason in msg */
|
|
|
-#define tt_abort_printf(msg) TT_DIE(msg)
|
|
|
+#define tt_abortprint_f(msg) TT_DIE(msg)
|
|
|
#define tt_abort_perror(op) TT_DIE(("%s: %s [%d]",(op),strerror(errno), errno))
|
|
|
#define tt_abort_msg(msg) TT_DIE(("%s", msg))
|
|
|
#define tt_abort() TT_DIE(("%s", "(Failed.)"))
|
|
|
|
|
|
/* Fail but do not abort the current test for the reason in msg. */
|
|
|
-#define tt_fail_printf(msg) TT_FAIL(msg)
|
|
|
+#define tt_failprint_f(msg) TT_FAIL(msg)
|
|
|
#define tt_fail_perror(op) TT_FAIL(("%s: %s [%d]",(op),strerror(errno), errno))
|
|
|
#define tt_fail_msg(msg) TT_FAIL(("%s", msg))
|
|
|
#define tt_fail() TT_FAIL(("%s", "(Failed.)"))
|
|
@@ -86,10 +86,10 @@
|
|
|
TT_EXIT_TEST_FUNCTION; \
|
|
|
TT_STMT_END
|
|
|
|
|
|
-#define _tt_want(b, msg, fail) \
|
|
|
+#define tt_want_(b, msg, fail) \
|
|
|
TT_STMT_BEGIN \
|
|
|
if (!(b)) { \
|
|
|
- _tinytest_set_test_failed(); \
|
|
|
+ tinytest_set_test_failed_(); \
|
|
|
TT_GRIPE(("%s",msg)); \
|
|
|
fail; \
|
|
|
} else { \
|
|
@@ -99,11 +99,11 @@
|
|
|
|
|
|
/* Assert b, but do not stop the test if b fails. Log msg on failure. */
|
|
|
#define tt_want_msg(b, msg) \
|
|
|
- _tt_want(b, msg, );
|
|
|
+ tt_want_(b, msg, );
|
|
|
|
|
|
/* Assert b and stop the test if b fails. Log msg on failure. */
|
|
|
#define tt_assert_msg(b, msg) \
|
|
|
- _tt_want(b, msg, TT_EXIT_TEST_FUNCTION);
|
|
|
+ tt_want_(b, msg, TT_EXIT_TEST_FUNCTION);
|
|
|
|
|
|
/* Assert b, but do not stop the test if b fails. */
|
|
|
#define tt_want(b) tt_want_msg( (b), "want("#b")")
|
|
@@ -113,28 +113,28 @@
|
|
|
#define tt_assert_test_fmt_type(a,b,str_test,type,test,printf_type,printf_fmt, \
|
|
|
setup_block,cleanup_block,die_on_fail) \
|
|
|
TT_STMT_BEGIN \
|
|
|
- type _val1 = (type)(a); \
|
|
|
- type _val2 = (type)(b); \
|
|
|
- int _tt_status = (test); \
|
|
|
- if (!_tt_status || _tinytest_get_verbosity()>1) { \
|
|
|
- printf_type _print; \
|
|
|
- printf_type _print1; \
|
|
|
- printf_type _print2; \
|
|
|
- type _value = _val1; \
|
|
|
+ type val1_ = (type)(a); \
|
|
|
+ type val2_ = (type)(b); \
|
|
|
+ int tt_status_ = (test); \
|
|
|
+ if (!tt_status_ || tinytest_get_verbosity_()>1) { \
|
|
|
+ printf_type print_; \
|
|
|
+ printf_type print1_; \
|
|
|
+ printf_type print2_; \
|
|
|
+ type value_ = val1_; \
|
|
|
setup_block; \
|
|
|
- _print1 = _print; \
|
|
|
- _value = _val2; \
|
|
|
+ print1_ = print_; \
|
|
|
+ value_ = val2_; \
|
|
|
setup_block; \
|
|
|
- _print2 = _print; \
|
|
|
- TT_DECLARE(_tt_status?" OK":"FAIL", \
|
|
|
+ print2_ = print_; \
|
|
|
+ TT_DECLARE(tt_status_?" OK":"FAIL", \
|
|
|
("assert(%s): "printf_fmt" vs "printf_fmt, \
|
|
|
- str_test, _print1, _print2)); \
|
|
|
- _print = _print1; \
|
|
|
+ str_test, print1_, print2_)); \
|
|
|
+ print_ = print1_; \
|
|
|
cleanup_block; \
|
|
|
- _print = _print2; \
|
|
|
+ print_ = print2_; \
|
|
|
cleanup_block; \
|
|
|
- if (!_tt_status) { \
|
|
|
- _tinytest_set_test_failed(); \
|
|
|
+ if (!tt_status_) { \
|
|
|
+ tinytest_set_test_failed_(); \
|
|
|
die_on_fail ; \
|
|
|
} \
|
|
|
} \
|
|
@@ -142,43 +142,43 @@
|
|
|
|
|
|
#define tt_assert_test_type(a,b,str_test,type,test,fmt,die_on_fail) \
|
|
|
tt_assert_test_fmt_type(a,b,str_test,type,test,type,fmt, \
|
|
|
- {_print=_value;},{},die_on_fail)
|
|
|
+ {print_=value_;},{},die_on_fail)
|
|
|
|
|
|
/* Helper: assert that a op b, when cast to type. Format the values with
|
|
|
* printf format fmt on failure. */
|
|
|
#define tt_assert_op_type(a,op,b,type,fmt) \
|
|
|
- tt_assert_test_type(a,b,#a" "#op" "#b,type,(_val1 op _val2),fmt, \
|
|
|
+ tt_assert_test_type(a,b,#a" "#op" "#b,type,(val1_ op val2_),fmt, \
|
|
|
TT_EXIT_TEST_FUNCTION)
|
|
|
|
|
|
#define tt_int_op(a,op,b) \
|
|
|
- tt_assert_test_type(a,b,#a" "#op" "#b,long,(_val1 op _val2), \
|
|
|
+ tt_assert_test_type(a,b,#a" "#op" "#b,long,(val1_ op val2_), \
|
|
|
"%ld",TT_EXIT_TEST_FUNCTION)
|
|
|
|
|
|
#define tt_uint_op(a,op,b) \
|
|
|
tt_assert_test_type(a,b,#a" "#op" "#b,unsigned long, \
|
|
|
- (_val1 op _val2),"%lu",TT_EXIT_TEST_FUNCTION)
|
|
|
+ (val1_ op val2_),"%lu",TT_EXIT_TEST_FUNCTION)
|
|
|
|
|
|
#define tt_ptr_op(a,op,b) \
|
|
|
tt_assert_test_type(a,b,#a" "#op" "#b,void*, \
|
|
|
- (_val1 op _val2),"%p",TT_EXIT_TEST_FUNCTION)
|
|
|
+ (val1_ op val2_),"%p",TT_EXIT_TEST_FUNCTION)
|
|
|
|
|
|
#define tt_str_op(a,op,b) \
|
|
|
tt_assert_test_type(a,b,#a" "#op" "#b,const char *, \
|
|
|
- (strcmp(_val1,_val2) op 0),"<%s>",TT_EXIT_TEST_FUNCTION)
|
|
|
+ (strcmp(val1_,val2_) op 0),"<%s>",TT_EXIT_TEST_FUNCTION)
|
|
|
|
|
|
#define tt_want_int_op(a,op,b) \
|
|
|
- tt_assert_test_type(a,b,#a" "#op" "#b,long,(_val1 op _val2),"%ld",(void)0)
|
|
|
+ tt_assert_test_type(a,b,#a" "#op" "#b,long,(val1_ op val2_),"%ld",(void)0)
|
|
|
|
|
|
#define tt_want_uint_op(a,op,b) \
|
|
|
tt_assert_test_type(a,b,#a" "#op" "#b,unsigned long, \
|
|
|
- (_val1 op _val2),"%lu",(void)0)
|
|
|
+ (val1_ op val2_),"%lu",(void)0)
|
|
|
|
|
|
#define tt_want_ptr_op(a,op,b) \
|
|
|
tt_assert_test_type(a,b,#a" "#op" "#b,void*, \
|
|
|
- (_val1 op _val2),"%p",(void)0)
|
|
|
+ (val1_ op val2_),"%p",(void)0)
|
|
|
|
|
|
#define tt_want_str_op(a,op,b) \
|
|
|
tt_assert_test_type(a,b,#a" "#op" "#b,const char *, \
|
|
|
- (strcmp(_val1,_val2) op 0),"<%s>",(void)0)
|
|
|
+ (strcmp(val1_,val2_) op 0),"<%s>",(void)0)
|
|
|
|
|
|
#endif
|