sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

r16174: Couple of fixes to the UI code - make 'torture_ok()' optional, be more verbose by default.

Browse Source 
(This used to be commit 8ef13a50b9)
This commit is contained in:
Jelmer Vernooij
2006-06-12 23:03:02 +00:00
committed by Gerald (Jerry) Carter
parent 90be000cd5
commit 02aee3000d
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source4/torture/smbtorture.c
View File

@ -240,7 +240,22 @@ static void simple_test_start (struct torture_test *test)
static void simple_test_result (struct torture_test *test, enum torture_result res, const char *reason) static void simple_test_result (struct torture_test *test, enum torture_result res, const char *reason)
{ {
printf("\t %d: %s\n",res, reason?reason:""); switch (res) {
case TORTURE_OK:
if (reason)
printf("OK: %s\n", reason);
break;
case TORTURE_FAIL:
printf("ERROR: %s - %s\n", test->name, reason);
break;
case TORTURE_TODO:
printf("TODO: %s - %s\n", test->name, reason);
break;
case TORTURE_SKIP:
printf("SKIP: %s - %s\n", test->name, reason);
break;
}
} }
static void simple_comment (struct torture_test *test, const char *comment) static void simple_comment (struct torture_test *test, const char *comment)

18
source4/torture/ui.c
View File

@ -22,6 +22,17 @@
#include "includes.h" #include "includes.h"
#include "torture/ui.h" #include "torture/ui.h"
static int test_destructor(void *_test)
{
struct torture_test *test = _test;
if (test->result == TORTURE_OK)
torture_ok(test);
return 0;
}
struct torture_test *torture_test(struct torture_context *ctx, const char *name, const char *description) struct torture_test *torture_test(struct torture_context *ctx, const char *name, const char *description)
{ {
struct torture_test *test = talloc(ctx, struct torture_test); struct torture_test *test = talloc(ctx, struct torture_test);
@ -32,6 +43,8 @@ struct torture_test *torture_test(struct torture_context *ctx, const char *name,
ctx->ui_ops->test_start(test); ctx->ui_ops->test_start(test);
talloc_set_destructor(test, test_destructor);
return test; return test;
} }
@ -44,8 +57,10 @@ struct torture_test *torture_subtest(struct torture_test *parent, const char *na
test->context = parent->context; test->context = parent->context;
test->context->ui_ops->test_start(test); test->context->ui_ops->test_start(test);
talloc_set_destructor(test, test_destructor);
return NULL; return test;
} }
void torture_comment(struct torture_test *test, const char *comment, ...) _PRINTF_ATTRIBUTE(2,3) void torture_comment(struct torture_test *test, const char *comment, ...) _PRINTF_ATTRIBUTE(2,3)
@ -60,6 +75,7 @@ void torture_comment(struct torture_test *test, const char *comment, ...) _PRINT
talloc_free(tmp); talloc_free(tmp);
} }
void torture_ok(struct torture_test *test) void torture_ok(struct torture_test *test)
{ {
test->context->ui_ops->test_result(test, TORTURE_OK, NULL); test->context->ui_ops->test_result(test, TORTURE_OK, NULL);

2
source4/torture/ui.h
View File

@ -43,6 +43,8 @@ struct torture_test
void *ui_data; void *ui_data;
enum torture_result result;
struct torture_context *context; struct torture_context *context;
}; };