diff options
| author | Russell Belfer <rb@github.com> | 2013-03-20 11:47:34 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-03-22 14:23:18 -0700 |
| commit | 7202ec29e9643b7262d827483d96b9e8708af543 (patch) | |
| tree | 2eee5968edf9fdbe285ddeac38ddcd0d41acf8b9 /tests-clar/clar.h | |
| parent | 7dbf4039ae0881407fc9ead24c09c1d7cfd4103a (diff) | |
| download | libgit2-7202ec29e9643b7262d827483d96b9e8708af543.tar.gz | |
Update to latest Clar
Diffstat (limited to 'tests-clar/clar.h')
| -rw-r--r-- | tests-clar/clar.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tests-clar/clar.h b/tests-clar/clar.h index 2ba6416b3..d92318bd4 100644 --- a/tests-clar/clar.h +++ b/tests-clar/clar.h @@ -51,17 +51,29 @@ void cl_fixture_cleanup(const char *fixture_name); /** * Forced failure/warning */ -#define cl_fail(desc) clar__assert(0, __FILE__, __LINE__, "Test failed.", desc, 1) -#define cl_warning(desc) clar__assert(0, __FILE__, __LINE__, "Warning during test execution:", desc, 0) +#define cl_fail(desc) clar__fail(__FILE__, __LINE__, "Test failed.", desc, 1) +#define cl_warning(desc) clar__fail(__FILE__, __LINE__, "Warning during test execution:", desc, 0) /** * Typed assertion macros */ #define cl_assert_equal_s(s1,s2) clar__assert_equal_s((s1),(s2),__FILE__,__LINE__,"String mismatch: " #s1 " != " #s2, 1) +#define cl_assert_equal_s_(s1,s2,note) clar__assert_equal_s((s1),(s2),__FILE__,__LINE__,"String mismatch: " #s1 " != " #s2 " (" #note ")", 1) + #define cl_assert_equal_i(i1,i2) clar__assert_equal_i((i1),(i2),__FILE__,__LINE__,#i1 " != " #i2, 1) +#define cl_assert_equal_i_(i1,i2,note) clar__assert_equal_i((i1),(i2),__FILE__,__LINE__,#i1 " != " #i2 " (" #note ")", 1) + #define cl_assert_equal_b(b1,b2) clar__assert_equal_i(!!(b1),!!(b2),__FILE__,__LINE__,#b1 " != " #b2, 1) + #define cl_assert_equal_p(p1,p2) cl_assert((p1) == (p2)) +void clar__fail( + const char *file, + int line, + const char *error, + const char *description, + int should_abort); + void clar__assert( int condition, const char *file, |