diff options
| -rw-r--r-- | lib/torture/simple.c | 85 | ||||
| -rw-r--r-- | lib/torture/torture.h | 1 | ||||
| -rw-r--r-- | lib/torture/wscript_build | 2 | ||||
| -rw-r--r-- | source4/torture/smbtorture.c | 65 |
4 files changed, 88 insertions, 65 deletions
diff --git a/lib/torture/simple.c b/lib/torture/simple.c new file mode 100644 index 0000000000..d234776bda --- /dev/null +++ b/lib/torture/simple.c @@ -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, +}; diff --git a/lib/torture/torture.h b/lib/torture/torture.h index 96cefcf943..3a080429a8 100644 --- a/lib/torture/torture.h +++ b/lib/torture/torture.h @@ -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__ */ diff --git a/lib/torture/wscript_build b/lib/torture/wscript_build index a68707a3a0..732e24a822 100644 --- a/lib/torture/wscript_build +++ b/lib/torture/wscript_build @@ -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', diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 04ba94d3e0..95f0719605 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -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 { |