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/raw | |
| 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/raw')
| -rw-r--r-- | source4/torture/raw/close.c | 4 | ||||
| -rw-r--r-- | source4/torture/raw/openbench.c | 2 | ||||
| -rw-r--r-- | source4/torture/raw/samba3misc.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c index 0e2543cfcf..6af234e4b4 100644 --- a/source4/torture/raw/close.c +++ b/source4/torture/raw/close.c @@ -101,13 +101,13 @@ BOOL torture_raw_close(struct torture_context *torture) printf("Incorrect times after close - only write time should be set\n"); dump_all_info(mem_ctx, &finfo); - if (!lp_parm_bool(-1, "torture", "samba3", False)) { + if (!torture_setting_bool(torture, "samba3", false)) { /* * In Samba3 as of 3.0.23d we don't yet support all * file times, so don't mark this as a critical * failure */ - ret = False; + ret = false; } } diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c index e5b47cebe1..fffb572d50 100644 --- a/source4/torture/raw/openbench.c +++ b/source4/torture/raw/openbench.c @@ -351,7 +351,7 @@ BOOL torture_bench_open(struct torture_context *torture) progress = torture_setting_bool(torture, "progress", true); - nprocs = lp_parm_int(-1, "torture", "nprocs", 4); + nprocs = torture_setting_int(torture, "nprocs", 4); state = talloc_zero_array(mem_ctx, struct benchopen_state, nprocs); diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c index c019c4e2ee..52ace05314 100644 --- a/source4/torture/raw/samba3misc.c +++ b/source4/torture/raw/samba3misc.c @@ -538,13 +538,13 @@ BOOL torture_samba3_badpath(struct torture_context *torture) status = raw_smbcli_t2open(cli_nt->tree, fpath, O_RDONLY | O_CREAT| O_EXCL, DENY_NONE, NULL); if (!NT_STATUS_EQUAL(status, NT_STATUS_EAS_NOT_SUPPORTED) - || !lp_parm_bool(-1, "torture", "samba3", False)) { + || !torture_setting_bool(torture, "samba3", false)) { /* Against samba3, treat EAS_NOT_SUPPORTED as acceptable */ CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_COLLISION); } status = raw_smbcli_t2open(cli_dos->tree, fpath, O_RDONLY | O_CREAT| O_EXCL, DENY_NONE, NULL); if (!NT_STATUS_EQUAL(status, NT_STATUS_DOS(ERRDOS,ERReasnotsupported)) - || !lp_parm_bool(-1, "torture", "samba3", False)) { + || !torture_setting_bool(torture, "samba3", false)) { /* Against samba3, treat EAS_NOT_SUPPORTED as acceptable */ CHECK_STATUS(status, NT_STATUS_DOS(ERRDOS,ERRfilexists)); } |