summaryrefslogtreecommitdiff
path: root/source4/torture/local
diff options
context:
space:
mode:
Diffstat (limited to 'source4/torture/local')
-rw-r--r--source4/torture/local/dbspeed.c4
-rw-r--r--source4/torture/local/iconv.c6
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);
}
}