diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-02-07 19:03:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:44:48 -0500 |
| commit | ecf2c1effb778a95fd863a5e87ec7e378d228b57 (patch) | |
| tree | 8b94782e07399490d6390e066c557af8c04aefc1 /source4/torture | |
| parent | 2811e18da0d8dae2e2560c11a28450ae8b2a98d5 (diff) | |
| download | samba-ecf2c1effb778a95fd863a5e87ec7e378d228b57.tar.gz | |
r21222: Merge a couple of pidl fixes:
* Pidl will now warn when trying to use pointers as integers in expressions.
* "subcontext()" is now marked as deprecated. The alternatives,
transmit_as() / represent_as() should be available soon.
* More tests.
* Remove some unused code in smbtorture.
(This used to be commit 37c0da541e3962164d5af3e3c9560803a733f3b7)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/smbtorture.c | 5 | ||||
| -rw-r--r-- | source4/torture/torture.c | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 79b00494caf..cc4c3e6b5b5 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -583,10 +583,8 @@ int main(int argc,char *argv[]) if (strcmp(target, "samba3") == 0) { lp_set_cmdline("torture:samba3", "true"); - lp_set_cmdline("torture:knownfail", "samba3-knownfail"); } else if (strcmp(target, "samba4") == 0) { lp_set_cmdline("torture:samba4", "true"); - lp_set_cmdline("torture:knownfail", "samba4-knownfail"); } if (max_runtime) { @@ -662,8 +660,7 @@ int main(int argc,char *argv[]) exit(1); } - torture = torture_context_init(talloc_autofree_context(), - lp_parm_string(-1, "torture", "knownfail"), ui_ops); + torture = torture_context_init(talloc_autofree_context(), ui_ops); if (argc_new == 0) { printf("You must specify a test to run, or 'ALL'\n"); diff --git a/source4/torture/torture.c b/source4/torture/torture.c index df25fdce745..e54efd72d02 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -42,7 +42,6 @@ bool torture_register_suite(struct torture_suite *suite) } struct torture_context *torture_context_init(TALLOC_CTX *mem_ctx, - const char *known_failures_file, const struct torture_ui_ops *ui_ops) { struct torture_context *torture = talloc_zero(mem_ctx, |