diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-08-28 00:16:58 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:02:58 -0500 |
commit | 2fefa818a95138fc7d6508093f426cb4ed92138f (patch) | |
tree | dff4b61a40639066ed8732555fb72c5218cd4e18 /source4/torture/smbtorture.c | |
parent | f8c373fd6a93be2327db024f7e149d91a7089590 (diff) | |
download | samba-2fefa818a95138fc7d6508093f426cb4ed92138f.tar.gz samba-2fefa818a95138fc7d6508093f426cb4ed92138f.tar.bz2 samba-2fefa818a95138fc7d6508093f426cb4ed92138f.zip |
r24728: Use more stock torture functions.
(This used to be commit da3a7ee407a2b41bd01f45072cad12bf29250b33)
Diffstat (limited to 'source4/torture/smbtorture.c')
-rw-r--r-- | source4/torture/smbtorture.c | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 3525f0d137..43f6b67f1c 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -382,41 +382,6 @@ const static struct torture_ui_ops subunit_ui_ops = { .suite_start = subunit_suite_start }; -static void harness_test_start (struct torture_context *ctx, - struct torture_tcase *tcase, - struct torture_test *test) -{ -} - -static void harness_test_result (struct torture_context *context, - enum torture_result res, const char *reason) -{ - switch (res) { - case TORTURE_OK: - printf("ok %s - %s\n", context->active_test->name, reason); - break; - case TORTURE_FAIL: - case TORTURE_ERROR: - printf("not ok %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 harness_comment (struct torture_context *test, - const char *comment) -{ - printf("# %s\n", comment); -} - -const static struct torture_ui_ops harness_ui_ops = { - .comment = harness_comment, - .test_start = harness_test_start, - .test_result = harness_test_result -}; - static void quiet_suite_start(struct torture_context *ctx, struct torture_suite *suite) { @@ -520,7 +485,7 @@ int main(int argc,char *argv[]) struct poptOption long_options[] = { POPT_AUTOHELP - {"format", 0, POPT_ARG_STRING, &ui_ops_name, 0, "Output format (one of: simple, subunit, harness)", NULL }, + {"format", 0, POPT_ARG_STRING, &ui_ops_name, 0, "Output format (one of: simple, subunit)", NULL }, {"smb-ports", 'p', POPT_ARG_STRING, NULL, OPT_SMB_PORTS, "SMB ports", NULL}, {"basedir", 0, POPT_ARG_STRING, NULL, OPT_BASEDIR, "base directory", "BSAEDIR" }, {"seed", 0, POPT_ARG_INT, &torture_seed, 0, "seed", NULL}, @@ -662,8 +627,6 @@ int main(int argc,char *argv[]) ui_ops = &std_ui_ops; } else if (!strcmp(ui_ops_name, "subunit")) { ui_ops = &subunit_ui_ops; - } else if (!strcmp(ui_ops_name, "harness")) { - ui_ops = &harness_ui_ops; } else if (!strcmp(ui_ops_name, "quiet")) { ui_ops = &quiet_ui_ops; } else { |