From 9c4bd59002109c850dda3ab79febc17f7f0367e9 Mon Sep 17 00:00:00 2001 From: sanine Date: Sat, 25 Dec 2021 23:12:46 -0600 Subject: begin refactor to two-file library --- lily-test.h | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) (limited to 'lily-test.h') diff --git a/lily-test.h b/lily-test.h index df50afb..c2f1b8b 100644 --- a/lily-test.h +++ b/lily-test.h @@ -1,44 +1,21 @@ #ifndef LILY_TEST_H #define LILY_TEST_H +#include #include +#include -/* gives a string like 'some/filename:xxx' */ #define STR_IMP(x) #x #define STR(x) STR_IMP(x) /* define SOURCE_PATH_SIZE to strip away the leading parts of the full compilation path */ #ifndef SOURCE_PATH_SIZE -#define LILY_LOCATION "" __FILE__ ":" STR(__LINE__) +#define LILY_LOCATION (__FILE__ ":" STR(__LINE__)) #else -#define LILY_LOCATION (("" __FILE__ ":" STR(__LINE__)) + SOURCE_PATH_SIZE) +#define LILY_LOCATION ((__FILE__ ":" STR(__LINE__)) + SOURCE_PATH_SIZE) #endif -struct lily_test_result_t { - int error; - const char *message; - const char *location; - void *data; -}; - -typedef struct lily_test_result_t lily_test; -#define LILY_SUCCESS (struct lily_test_result_t){ 0, NULL, NULL, NULL } - -// assertions -#define LILY_NO_ERROR 0 -#define LILY_NULL_DATA 1 -#define LILY_INT_DATA 2 -#define LILY_STRING_DATA 3 - -#define lily_assert_msg(statement, code, message, data) do { \ - if(!(statement)) { \ - return (struct lily_test_result_t){ \ - (code), (message), LILY_LOCATION, (data) \ - }; \ - } \ - } while(0) - -#define lily_assert_equal(a, b) \ - lily_assert_msg(a == b, LILY_NULL_DATA, #a " is not equal to " #b, NULL) +void lily_assert_printf(bool statement, const char *location, + const char *format_string, ...); #endif -- cgit v1.2.1