diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2014-11-01 21:17:39 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-03-24 04:51:13 +0100 |
| commit | 368e50ff617dda5965e3de7aacb4bd08e5ee24c2 (patch) | |
| tree | 440920e7fd7e4e4aecbbecf53e3d445b4801757e /source4/scripting | |
| parent | 247974bd977607aa289c1ffb4a5cef0a1f200090 (diff) | |
| download | samba-368e50ff617dda5965e3de7aacb4bd08e5ee24c2.tar.gz | |
Move option handling into samba.tests.subunitrun.
Change-Id: I65a73b74854af636413f4f284147f3bcf28b6f82
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit ee281c61d01b5fb167571b8ace5e739758100db6)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137
Diffstat (limited to 'source4/scripting')
| -rwxr-xr-x | source4/scripting/bin/subunitrun | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun index 48b507a7b41..99d53196eea 100755 --- a/source4/scripting/bin/subunitrun +++ b/source4/scripting/bin/subunitrun @@ -10,18 +10,18 @@ # get e.g. credentials passed via command-line options to this # script. -# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2011 -# +# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2014 +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # @@ -78,10 +78,8 @@ parser.add_option_group(subunitopts) opts, args = parser.parse_args() -if getattr(opts, "listtests", False): - args.insert(0, "--list") -else: +if not getattr(opts, "listtests", False): lp = sambaopts.get_loadparm() samba.tests.cmdline_credentials = credopts.get_credentials(lp) -TestProgram(module=None, argv=[sys.argv[0]] + args) +TestProgram(module=None, args=args, opts=subunitopts) |