The branch, master has been updated via 478503694a860018740a93296e66d5cb0caa53c9 (commit) via afe7949313ba7a4f724ac578770ca5143901eb4a (commit) from a88bbaf6706d6e5902839dfa395641500b5c4064 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 478503694a860018740a93296e66d5cb0caa53c9 Author: Jelmer Vernooij <jel...@samba.org> Date: Sat Jun 13 16:14:39 2009 +0200 smbtorture: Output subunit by default. commit afe7949313ba7a4f724ac578770ca5143901eb4a Author: Jelmer Vernooij <jel...@samba.org> Date: Sat Jun 13 16:13:32 2009 +0200 smbtorture: Remove unused 'quiet' output format. ----------------------------------------------------------------------- Summary of changes: source4/torture/smbtorture.c | 38 +------------------------------------- 1 files changed, 1 insertions(+), 37 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index d01dc9a..f559d7d 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -367,40 +367,6 @@ const static struct torture_ui_ops std_ui_ops = { }; -static void quiet_suite_start(struct torture_context *ctx, - struct torture_suite *suite) -{ - int i; - ctx->results->quiet = true; - for (i = 1; i < ctx->level; i++) putchar('\t'); - printf("%s: ", suite->name); - fflush(stdout); -} - -static void quiet_suite_finish(struct torture_context *ctx, - struct torture_suite *suite) -{ - putchar('\n'); -} - -static void quiet_test_result(struct torture_context *context, - enum torture_result res, const char *reason) -{ - fflush(stdout); - switch (res) { - case TORTURE_OK: putchar('.'); break; - case TORTURE_FAIL: putchar('F'); break; - case TORTURE_ERROR: putchar('E'); break; - case TORTURE_SKIP: putchar('I'); break; - } -} - -const static struct torture_ui_ops quiet_ui_ops = { - .suite_start = quiet_suite_start, - .suite_finish = quiet_suite_finish, - .test_result = quiet_test_result -}; - static void run_shell(struct torture_context *tctx) { char *cline; @@ -464,7 +430,7 @@ int main(int argc,char *argv[]) static const char *target = "other"; NTSTATUS status; int shell = false; - static const char *ui_ops_name = "simple"; + static const char *ui_ops_name = "subunit"; const char *basedir = NULL; const char *extra_module = NULL; static int list_tests = 0; @@ -624,8 +590,6 @@ int main(int argc,char *argv[]) ui_ops = &std_ui_ops; } else if (!strcmp(ui_ops_name, "subunit")) { ui_ops = &torture_subunit_ui_ops; - } else if (!strcmp(ui_ops_name, "quiet")) { - ui_ops = &quiet_ui_ops; } else { printf("Unknown output format '%s'\n", ui_ops_name); exit(1); -- Samba Shared Repository