diff options
Diffstat (limited to 'tests/trace/trace.c')
| -rw-r--r-- | tests/trace/trace.c | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/tests/trace/trace.c b/tests/trace/trace.c index 328539379..87b325378 100644 --- a/tests/trace/trace.c +++ b/tests/trace/trace.c @@ -3,49 +3,44 @@ static int written = 0; -static void trace_callback( - git_trace_level_t level, - void *cb_payload, - void *msg_payload, - const char *msg) +static void trace_callback(git_trace_level_t level, const char *message) { - GIT_UNUSED(level); GIT_UNUSED(msg_payload); + GIT_UNUSED(level); - cl_assert(strcmp(msg, "Hello world!") == 0); + cl_assert(strcmp(message, "Hello world!") == 0); - if (cb_payload) - *((int *)cb_payload) = 1; + written = 1; } void test_trace_trace__initialize(void) { - git_trace_set(GIT_TRACE_INFO_AND_BELOW, trace_callback, &written); + git_trace_set(GIT_TRACE_INFO, trace_callback); written = 0; } void test_trace_trace__cleanup(void) { - git_trace_set(GIT_TRACE_NONE, NULL, NULL); + git_trace_set(GIT_TRACE_NONE, NULL); } void test_trace_trace__sets(void) { #ifdef GIT_TRACE - cl_assert(git_trace_level() == GIT_TRACE_INFO_AND_BELOW); + cl_assert(git_trace_level() == GIT_TRACE_INFO); #endif } void test_trace_trace__can_reset(void) { #ifdef GIT_TRACE - cl_assert(git_trace_level() == GIT_TRACE_INFO_AND_BELOW); - cl_git_pass(git_trace_set(GIT_TRACE_ERROR, trace_callback, &written)); + cl_assert(git_trace_level() == GIT_TRACE_INFO); + cl_git_pass(git_trace_set(GIT_TRACE_ERROR, trace_callback)); cl_assert(written == 0); - git_trace(GIT_TRACE_INFO, NULL, "Hello %s!", "world"); + git_trace(GIT_TRACE_INFO, "Hello %s!", "world"); cl_assert(written == 0); - git_trace(GIT_TRACE_ERROR, NULL, "Hello %s!", "world"); + git_trace(GIT_TRACE_ERROR, "Hello %s!", "world"); cl_assert(written == 1); #endif } @@ -53,13 +48,13 @@ void test_trace_trace__can_reset(void) void test_trace_trace__can_unset(void) { #ifdef GIT_TRACE - cl_assert(git_trace_level() == GIT_TRACE_INFO_AND_BELOW); - cl_git_pass(git_trace_set(GIT_TRACE_NONE, NULL, NULL)); + cl_assert(git_trace_level() == GIT_TRACE_INFO); + cl_git_pass(git_trace_set(GIT_TRACE_NONE, NULL)); cl_assert(git_trace_level() == GIT_TRACE_NONE); cl_assert(written == 0); - git_trace(GIT_TRACE_FATAL, NULL, "Hello %s!", "world"); + git_trace(GIT_TRACE_FATAL, "Hello %s!", "world"); cl_assert(written == 0); #endif } @@ -68,7 +63,7 @@ void test_trace_trace__skips_higher_level(void) { #ifdef GIT_TRACE cl_assert(written == 0); - git_trace(GIT_TRACE_DEBUG, NULL, "Hello %s!", "world"); + git_trace(GIT_TRACE_DEBUG, "Hello %s!", "world"); cl_assert(written == 0); #endif } @@ -77,7 +72,7 @@ void test_trace_trace__writes(void) { #ifdef GIT_TRACE cl_assert(written == 0); - git_trace(GIT_TRACE_INFO, NULL, "Hello %s!", "world"); + git_trace(GIT_TRACE_INFO, "Hello %s!", "world"); cl_assert(written == 1); #endif } @@ -86,7 +81,7 @@ void test_trace_trace__writes_lower_level(void) { #ifdef GIT_TRACE cl_assert(written == 0); - git_trace(GIT_TRACE_ERROR, NULL, "Hello %s!", "world"); + git_trace(GIT_TRACE_ERROR, "Hello %s!", "world"); cl_assert(written == 1); #endif } |