summaryrefslogtreecommitdiff
path: root/source4/torture/basic
diff options
context:
space:
mode:
Diffstat (limited to 'source4/torture/basic')
-rw-r--r--source4/torture/basic/base.c2
-rw-r--r--source4/torture/basic/denytest.c6
-rw-r--r--source4/torture/basic/disconnect.c2
-rw-r--r--source4/torture/basic/misc.c14
4 files changed, 12 insertions, 12 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 1c2b835aa8..2a7ba85b3d 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1569,7 +1569,7 @@ static BOOL torture_samba3_errorpaths(struct torture_context *tctx)
}
}
- if (!lp_parm_bool(-1, "target", "samba3", False)) {
+ if (!torture_setting_bool(tctx, "samba3", False)) {
goto done;
}
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index cd724b1d4e..3d91058174 100644
--- a/source4/torture/basic/denytest.c
+++ b/source4/torture/basic/denytest.c
@@ -1460,7 +1460,7 @@ BOOL torture_denytest1(struct torture_context *tctx,
}
}
- if (lp_parm_bool(-1, "torture", "showall", False) ||
+ if (torture_setting_bool(tctx, "showall", False) ||
res != denytable1[i].result) {
int64_t tdif;
GetTimeOfDay(&tv);
@@ -1547,7 +1547,7 @@ BOOL torture_denytest2(struct torture_context *tctx,
}
}
- if (lp_parm_bool(-1, "torture", "showall", False) ||
+ if (torture_setting_bool(tctx, "showall", False) ||
res != denytable2[i].result) {
int64_t tdif;
GetTimeOfDay(&tv);
@@ -1852,7 +1852,7 @@ static BOOL torture_ntdenytest(struct torture_context *tctx,
GetTimeOfDay(&tv);
tdif = usec_time_diff(&tv, &tv_start);
tdif /= 1000;
- if (lp_parm_bool(-1, "torture", "showall", False) ||
+ if (torture_setting_bool(tctx, "showall", False) ||
!NT_STATUS_EQUAL(status2, status2_p) ||
res != res2) {
torture_comment(tctx, "\n%-20s %-70s\n%-20s %-70s %4s %4s %s/%s\n",
diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c
index 348f59d057..5bc7d997ed 100644
--- a/source4/torture/basic/disconnect.c
+++ b/source4/torture/basic/disconnect.c
@@ -156,7 +156,7 @@ BOOL torture_disconnect(struct torture_context *torture)
return False;
}
- if (lp_parm_bool(-1, "target", "samba3", False)) {
+ if (torture_setting_bool(torture, "samba3", False)) {
/*
* In Samba3 it might happen that the old smbd from
* test_disconnect_lock is not scheduled before the
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index c00372b805..0059574939 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -419,13 +419,13 @@ static int init_benchrw_params(struct torture_context *tctx, struct params *lpar
char **unc_list = NULL;
int num_unc_names = 0, conn_index=0, empty_lines=0;
const char *p;
- lpar->retry = lp_parm_int(-1, "torture", "retry",3);
- lpar->blocksize = lp_parm_int(-1, "torture", "blocksize",65535);
- lpar->writeblocks = lp_parm_int(-1, "torture", "writeblocks",15);
- lpar->writeratio = lp_parm_int(-1, "torture", "writeratio",5);
+ lpar->retry = torture_setting_int(tctx, "retry",3);
+ lpar->blocksize = torture_setting_int(tctx, "blocksize",65535);
+ lpar->writeblocks = torture_setting_int(tctx, "writeblocks",15);
+ lpar->writeratio = torture_setting_int(tctx, "writeratio",5);
lpar->workgroup = lp_workgroup();
- p = lp_parm_string(-1, "torture", "unclist");
+ p = torture_setting_string(tctx, "unclist", NULL);
if (p) {
char *h, *s;
unc_list = file_lines_load(p, &num_unc_names, NULL);
@@ -455,8 +455,8 @@ static int init_benchrw_params(struct torture_context *tctx, struct params *lpar
}else{
lpar->unc = talloc_array(tctx, struct unclist *, 1);
lpar->unc[0] = talloc(tctx,struct unclist);
- lpar->unc[0]->host = lp_parm_string(-1, "torture", "host");
- lpar->unc[0]->share = lp_parm_string(-1, "torture", "share");
+ lpar->unc[0]->host = torture_setting_string(tctx, "host", NULL);
+ lpar->unc[0]->share = torture_setting_string(tctx, "share", NULL);
return 1;
}
}