From 51058213cb183bcb127f5bb275cbb781efc55e35 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 13 Jun 2010 16:38:24 +0200 Subject: 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. --- source4/scripting/bin/subunitrun | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source4/scripting/bin') 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] ") 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) -- cgit