diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-18 14:23:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:24 -0500 |
| commit | a39f239cb28e4ac6be207d4179bacffce97f1b3e (patch) | |
| tree | b9f7e4e7e4c6ad7a5d0107b99c75ee2e9ac2132f /source4/torture/local | |
| parent | 19af876bbb7038f5a40cd87eced81661a2fc2ee6 (diff) | |
| download | samba-a39f239cb28e4ac6be207d4179bacffce97f1b3e.tar.gz samba-a39f239cb28e4ac6be207d4179bacffce97f1b3e.tar.bz2 samba-a39f239cb28e4ac6be207d4179bacffce97f1b3e.zip | |
r19392: Use torture_setting_* rather than lp_parm_* where possible.
(This used to be commit b28860978fe29c5b10abfb8c59d7182864e21dd6)
Diffstat (limited to 'source4/torture/local')
| -rw-r--r-- | source4/torture/local/dbspeed.c | 4 | ||||
| -rw-r--r-- | source4/torture/local/iconv.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c index 4eac7c9499..b6b734eef2 100644 --- a/source4/torture/local/dbspeed.c +++ b/source4/torture/local/dbspeed.c @@ -52,7 +52,7 @@ static BOOL test_tdb_speed(struct torture_context *torture, const void *_data) { struct timeval tv; struct tdb_wrap *tdbw; - int timelimit = lp_parm_int(-1, "torture", "timelimit", 10); + int timelimit = torture_setting_int(torture, "timelimit", 10); int i, count; TALLOC_CTX *tmp_ctx = talloc_new(torture); @@ -158,7 +158,7 @@ static BOOL test_ldb_speed(struct torture_context *torture, const void *_data) { struct timeval tv; struct ldb_context *ldb; - int timelimit = lp_parm_int(-1, "torture", "timelimit", 10); + int timelimit = torture_setting_int(torture, "timelimit", 10); int i, count; TALLOC_CTX *tmp_ctx = talloc_new(torture); struct ldb_ldif *ldif; diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c index 28834a6680..e41e40dc8d 100644 --- a/source4/torture/local/iconv.c +++ b/source4/torture/local/iconv.c @@ -304,8 +304,8 @@ static bool test_first_1m(struct torture_context *tctx) } if (codepoint % 1000 == 0) { - if (!lp_parm_bool(-1, "torture", "progress", True)) { - printf("codepoint=%u \r", codepoint); + if (!torture_setting_bool(tctx, "progress", True)) { + torture_comment(tctx, "codepoint=%u \r", codepoint); } } @@ -324,7 +324,7 @@ static bool test_random_5m(struct torture_context *tctx) unsigned int c; if (i % 1000 == 0) { - if (!lp_parm_bool(-1, "torture", "progress", True)) { + if (!torture_setting_bool(tctx, "progress", true)) { torture_comment(tctx, "i=%u \r", i); } } |