proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-08 00:48:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test: Print last error message properly

Browse Source
This commit is contained in:
Vicent Marti 2011-06-28 20:27:38 +02:00
parent c682886e8e
commit 5cf1f909e4
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/test_lib.c
View File

@ -15,8 +15,7 @@ struct git_test {
char *message; char *message;
char *failed_pos; char *failed_pos;
char *description; char *description;
char *error_message;
int ret_value;
git_testfunc function; git_testfunc function;
unsigned failed:1, ran:1; unsigned failed:1, ran:1;
@ -36,6 +35,7 @@ static void test_free(git_test *t)
free(t->description); free(t->description);
free(t->failed_pos); free(t->failed_pos);
free(t->message); free(t->message);
free(t->error_message);
free(t); free(t);
} }
} }
@ -57,15 +57,8 @@ static git_test *create_test(git_testfunc function)
{ {
git_test *t = DO_ALLOC(git_test); git_test *t = DO_ALLOC(git_test);
t->name = NULL; memset(t, 0x0, sizeof(git_test));
t->failed = 0;
t->ran = 0;
t->description = NULL;
t->message = NULL;
t->ret_value = 0;
t->failed_pos = NULL;
t->function = function; t->function = function;
t->jump = NULL;
return t; return t;
} }
@ -81,7 +74,7 @@ void git_test__init(git_test *t, const char *name, const char *description)
* Public assert methods * Public assert methods
*-------------------------------------------------------------------------*/ *-------------------------------------------------------------------------*/
static void fail_test(git_test *tc, const char *file, int line, const char *message, int ret_value) static void fail_test(git_test *tc, const char *file, int line, const char *message)
{ {
char buf[1024]; char buf[1024];
@ -89,8 +82,8 @@ static void fail_test(git_test *tc, const char *file, int line, const char *mess
tc->failed = 1; tc->failed = 1;
tc->message = strdup(message); tc->message = strdup(message);
tc->ret_value = ret_value;
tc->failed_pos = strdup(buf); tc->failed_pos = strdup(buf);
tc->error_message = strdup(git_lasterror());
if (tc->jump != 0) if (tc->jump != 0)
longjmp(*(tc->jump), 0); longjmp(*(tc->jump), 0);
@ -98,19 +91,19 @@ static void fail_test(git_test *tc, const char *file, int line, const char *mess
void git_test__fail(git_test *tc, const char *file, int line, const char *message) void git_test__fail(git_test *tc, const char *file, int line, const char *message)
{ {
fail_test(tc, file, line, message, 0); fail_test(tc, file, line, message);
} }
void git_test__assert(git_test *tc, const char *file, int line, const char *message, int condition) void git_test__assert(git_test *tc, const char *file, int line, const char *message, int condition)
{ {
if (condition == 0) if (condition == 0)
fail_test(tc, file, line, message, 0); fail_test(tc, file, line, message);
} }
void git_test__assert_pass(git_test *tc, const char *file, int line, const char *message, int ret_value) void git_test__assert_pass(git_test *tc, const char *file, int line, const char *message, int ret_value)
{ {
if (ret_value < 0) if (ret_value < 0)
fail_test(tc, file, line, message, ret_value); fail_test(tc, file, line, message);
} }
/*-------------------------------------------------------------------------* /*-------------------------------------------------------------------------*
@ -167,8 +160,8 @@ static void print_details(git_testsuite *ts)
failCount++; failCount++;
printf(" %d) \"%s\" [test %s @ %s]\n\t%s\n", printf(" %d) \"%s\" [test %s @ %s]\n\t%s\n",
failCount, tc->description, tc->name, tc->failed_pos, tc->message); failCount, tc->description, tc->name, tc->failed_pos, tc->message);
if (tc->ret_value) if (tc->error_message)
printf("\tError: (%d) %s\n", tc->ret_value, git_lasterror()); printf("\tError: %s\n", tc->error_message);
} }
} }
} }