diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-06-13 16:38:24 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-13 18:19:03 +0200 |
| commit | 51058213cb183bcb127f5bb275cbb781efc55e35 (patch) | |
| tree | cdf9394eaba7e5ab2e784cd18518770469f99075 /source4/scripting/bin/subunitrun | |
| parent | 46037a816091506c4c89df6141d57b281728b395 (diff) | |
| download | samba-51058213cb183bcb127f5bb275cbb781efc55e35.tar.gz samba-51058213cb183bcb127f5bb275cbb781efc55e35.tar.bz2 samba-51058213cb183bcb127f5bb275cbb781efc55e35.zip | |
s4-test: Use smb.conf path set in environment rather than using
command-line options.
This is the first step towards supporting custom test runners.
Diffstat (limited to 'source4/scripting/bin/subunitrun')
| -rwxr-xr-x | source4/scripting/bin/subunitrun | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun index 35145b973c..a6337e505b 100755 --- a/source4/scripting/bin/subunitrun +++ b/source4/scripting/bin/subunitrun @@ -35,13 +35,10 @@ from subunit.run import SubunitTestRunner parser = optparse.OptionParser("subunitrun [options] <tests>") credopts = options.CredentialsOptions(parser) parser.add_option_group(credopts) -sambaopts = options.SambaOptions(parser) -parser.add_option_group(sambaopts) args = parser.parse_args()[1] -samba.tests.cmdline_loadparm = sambaopts.get_loadparm() -samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.cmdline_loadparm) +samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.env_loadparm()) runner = SubunitTestRunner() program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner) |