diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-03-09 02:24:14 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2004-03-09 02:24:14 +0000 |
| commit | dda01cea55fefd450b3de5e8bacb99f264b62486 (patch) | |
| tree | 25a4a40768ddaf6d49454083d2fbfa058c16338d | |
| parent | 2d9a8bf0c93d0f4c8c02b3dfe074f59dba97009b (diff) | |
| download | samba-dda01cea55fefd450b3de5e8bacb99f264b62486.tar.gz samba-dda01cea55fefd450b3de5e8bacb99f264b62486.tar.bz2 samba-dda01cea55fefd450b3de5e8bacb99f264b62486.zip | |
handle incomplete load files
change default timelimit to 600 secs
(This used to be commit c5c75a6adab10e35584dca760586fda333ca5308)
| -rw-r--r-- | source4/torture/nbench/nbench.c | 6 | ||||
| -rw-r--r-- | source4/torture/nbench/nbio.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c index 6b0e78e1ab..3da7dedae1 100644 --- a/source4/torture/nbench/nbench.c +++ b/source4/torture/nbench/nbench.c @@ -21,8 +21,8 @@ #include "includes.h" int nbench_line_count = 0; -static int timelimit = 300; -static const char *loadfile; +static int timelimit = 600; +static char *loadfile; #define ival(s) strtol(s, NULL, 0) @@ -188,5 +188,3 @@ BOOL torture_nbench(int dummy) 1.0e-6 * nbio_total() / t); return correct; } - - diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c index 819383b7d8..4ce3ea011b 100644 --- a/source4/torture/nbench/nbio.c +++ b/source4/torture/nbench/nbio.c @@ -22,7 +22,7 @@ #include "includes.h" -#define MAX_FILES 1000 +#define MAX_FILES 100 extern int nbench_line_count; static int nbio_id; @@ -557,6 +557,10 @@ void nb_deltree(const char *dname) { int total_deleted; + smb_raw_exit(c->session); + + ZERO_STRUCT(ftable); + total_deleted = cli_deltree(c->tree, dname); if (total_deleted == -1) { @@ -570,7 +574,6 @@ void nb_deltree(const char *dname) void nb_cleanup(const char *cname) { char *dname = NULL; - smb_raw_exit(c->session); asprintf(&dname, "\\clients\\%s", cname); nb_deltree(dname); free(dname); |