From 8773e743c518578584d07d35ffdafdd598af88b0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 16 Oct 2006 13:06:41 +0000 Subject: r19339: Merge my 4.0-unittest branch. This adds an API for more fine-grained output in the testsuite rather than just True or False for a set of tests. The aim is to use this for: * known failure lists (run all tests and detect tests that started working or started failing). This would allow us to get rid of the RPC-SAMBA3-* tests * nicer torture output * simplification of the testsuite system * compatibility with other unit testing systems * easier usage of smbtorture (being able to run one test and automatically set up the environment for that) This is still a work-in-progress; expect more updates over the next couple of days. (This used to be commit 0eb6097305776325c75081356309115f445a7218) --- source4/torture/nbench/nbench.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'source4/torture/nbench/nbench.c') diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c index 47621d46a0..fe3c905b46 100644 --- a/source4/torture/nbench/nbench.c +++ b/source4/torture/nbench/nbench.c @@ -20,6 +20,7 @@ #include "includes.h" #include "libcli/libcli.h" +#include "torture/ui.h" #include "torture/util.h" #include "torture/torture.h" #include "system/filesys.h" @@ -35,7 +36,7 @@ static const char *loadfile; #define ival(s) strtol(s, NULL, 0) /* run a test that simulates an approximate netbench client load */ -static BOOL run_netbench(struct smbcli_state *cli, int client) +static BOOL run_netbench(struct torture_context *tctx, struct smbcli_state *cli, int client) { extern int torture_nprocs; int i; @@ -211,7 +212,7 @@ BOOL torture_nbench(struct torture_context *torture) signal(SIGALRM, nb_alarm); alarm(1); - torture_create_procs(run_netbench, &correct); + torture_create_procs(torture, run_netbench, &correct); alarm(0); if (torture_nprocs > 1) { @@ -224,6 +225,15 @@ BOOL torture_nbench(struct torture_context *torture) NTSTATUS torture_nbench_init(void) { - register_torture_op("BENCH-NBENCH", torture_nbench); + struct torture_suite *suite = torture_suite_create( + talloc_autofree_context(), + "BENCH"); + + torture_suite_add_simple_test(suite, "NBENCH", torture_nbench); + + suite->description = talloc_strdup(suite, + "Benchmarks"); + + torture_register_suite(suite); return NT_STATUS_OK; } -- cgit