diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-10-26 13:12:54 -0800 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-10-27 05:16:18 -0800 |
| commit | fcb7926ce544a8d4b0e5aa6577fe21712b38bb53 (patch) | |
| tree | 29dcedf492f0c540623bac99b9cc7a321d06be86 /source3/selftest | |
| parent | 6bcb25673bdc249f5a49ded912d90bc84b13809d (diff) | |
| download | samba-fcb7926ce544a8d4b0e5aa6577fe21712b38bb53.tar.gz samba-fcb7926ce544a8d4b0e5aa6577fe21712b38bb53.tar.bz2 samba-fcb7926ce544a8d4b0e5aa6577fe21712b38bb53.zip | |
selftest/selftesthelpers: Share environment handling for extra smbtorture options.
Diffstat (limited to 'source3/selftest')
| -rwxr-xr-x | source3/selftest/tests.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 01fbf0aee5..c4b2aeeba5 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -33,18 +33,17 @@ ntlm_auth = binpath('ntlm_auth3') dbwrap_tool = binpath('dbwrap_tool') vfstest = binpath('vfstest') -torture_options = [configuration, "--maximum-runtime=$SELFTEST_MAXTIME", - "--basedir=$SELFTEST_TMPDIR", +torture_options = [configuration, + '--maximum-runtime=$SELFTEST_MAXTIME', + '--basedir=$SELFTEST_TMPDIR', '--option="torture:winbindd_netbios_name=$SERVER"', '--option="torture:winbindd_netbios_domain=$DOMAIN"', '--option=torture:sharedelay=100000', - '--option=torture:writetimeupdatedelay=500000' ] + '--option=torture:writetimeupdatedelay=500000', + '--format=subunit' + ] -if not os.getenv("SELFTEST_VERBOSE"): - torture_options.append("--option=torture:progress=no") -torture_options.append("--format=subunit") -if os.getenv("SELFTEST_QUICK"): - torture_options.append("--option=torture:quick=yes") +torture_options.extend(env_get_torture_options()) smbtorture4 += " " + " ".join(torture_options) |