sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

libtorture: factor out simple ui backend

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Gregor Beck 2011-10-18 13:15:22 +02:00 committed by Stefan Metzmacher
parent c3f1aed86f
commit 160ca49953
4 changed files with 88 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
lib/torture/simple.c Normal file
View File

@ -0,0 +1,85 @@
/*
Unix SMB/CIFS implementation.
SMB torture tester
Copyright (C) Andrew Tridgell 1997-2003
Copyright (C) Jelmer Vernooij 2006-2008
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
#include "lib/torture/torture.h"
static struct timeval last_suite_started;
static void simple_suite_start(struct torture_context *ctx,
struct torture_suite *suite)
{
last_suite_started = timeval_current();
printf("Running %s\n", suite->name);
}
static void simple_suite_finish(struct torture_context *ctx,
struct torture_suite *suite)
{
printf("%s took %g secs\n\n", suite->name,
timeval_elapsed(&last_suite_started));
}
static void simple_test_result(struct torture_context *context,
enum torture_result res, const char *reason)
{
switch (res) {
case TORTURE_OK:
if (reason)
printf("OK: %s\n", reason);
break;
case TORTURE_FAIL:
printf("TEST %s FAILED! - %s\n", context->active_test->name, reason);
break;
case TORTURE_ERROR:
printf("ERROR IN TEST %s! - %s\n", context->active_test->name, reason);
break;
case TORTURE_SKIP:
printf("SKIP: %s - %s\n", context->active_test->name, reason);
break;
}
}
static void simple_comment(struct torture_context *test,
const char *comment)
{
printf("%s", comment);
}
static void simple_warning(struct torture_context *test,
const char *comment)
{
fprintf(stderr, "WARNING: %s\n", comment);
}
static void simple_progress(struct torture_context *test,
int offset, enum torture_progress_whence whence)
{
}
const struct torture_ui_ops torture_simple_ui_ops = {
.comment = simple_comment,
.warning = simple_warning,
.suite_start = simple_suite_start,
.suite_finish = simple_suite_finish,
.test_result = simple_test_result,
.progress = simple_progress,
};

1
lib/torture/torture.h
View File

@ -546,5 +546,6 @@ struct torture_results *torture_results_init(TALLOC_CTX *mem_ctx, const struct t
struct torture_context *torture_context_child(struct torture_context *tctx);
extern const struct torture_ui_ops torture_subunit_ui_ops;
extern const struct torture_ui_ops torture_simple_ui_ops;
#endif /* __TORTURE_UI_H__ */

2
lib/torture/wscript_build
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
bld.SAMBA_LIBRARY('torture',
source='torture.c subunit.c',
source='torture.c subunit.c simple.c',
vnum='0.0.1',
pc_files='torture.pc',
public_deps='samba-hostconfig samba-util errors talloc tevent subunit',

65
source4/torture/smbtorture.c
View File

@ -350,69 +350,6 @@ _NORETURN_ static void max_runtime_handler(int sig)
exit(1);
}
struct timeval last_suite_started;
static void simple_suite_start(struct torture_context *ctx,
struct torture_suite *suite)
{
last_suite_started = timeval_current();
printf("Running %s\n", suite->name);
}
static void simple_suite_finish(struct torture_context *ctx,
struct torture_suite *suite)
{
printf("%s took %g secs\n\n", suite->name,
timeval_elapsed(&last_suite_started));
}
static void simple_test_result(struct torture_context *context,
enum torture_result res, const char *reason)
{
switch (res) {
case TORTURE_OK:
if (reason)
printf("OK: %s\n", reason);
break;
case TORTURE_FAIL:
printf("TEST %s FAILED! - %s\n", context->active_test->name, reason);
break;
case TORTURE_ERROR:
printf("ERROR IN TEST %s! - %s\n", context->active_test->name, reason);
break;
case TORTURE_SKIP:
printf("SKIP: %s - %s\n", context->active_test->name, reason);
break;
}
}
static void simple_comment(struct torture_context *test,
const char *comment)
{
printf("%s", comment);
}
static void simple_warning(struct torture_context *test,
const char *comment)
{
fprintf(stderr, "WARNING: %s\n", comment);
}
static void simple_progress(struct torture_context *test,
int offset, enum torture_progress_whence whence)
{
}
const static struct torture_ui_ops std_ui_ops = {
.comment = simple_comment,
.warning = simple_warning,
.suite_start = simple_suite_start,
.suite_finish = simple_suite_finish,
.test_result = simple_test_result,
.progress = simple_progress,
};
/****************************************************************************
main program
****************************************************************************/
@ -653,7 +590,7 @@ int main(int argc,char *argv[])
srandom(torture_seed);
if (!strcmp(ui_ops_name, "simple")) {
ui_ops = &std_ui_ops;
ui_ops = &torture_simple_ui_ops;
} else if (!strcmp(ui_ops_name, "subunit")) {
ui_ops = &torture_subunit_ui_ops;
} else {