Bug 852959 - Remove old code paths for running xpcshell tests from directories; r=ted

Manifests are now the mechanism used to specify how to run xpcshell
tests. This patch removes old code paths that allowed directories to be
specified.

runxpcshelltests.py still contains references to "testdirs." These
should likely be removed as well. This patch doesn't touch them out of
fear it may have consequences on automation.

--HG--
extra : rebase_source : 8cbfe6dc759dc0a311669c4fcba08ff7a60edc4a
extra : amend_source : 890377d9ba33d52c84e0736b0812231f3005b253
This commit is contained in:
Gregory Szorc 2014-01-27 10:14:09 -08:00
Родитель 25f58c3fd6
Коммит 28dfc8126d
1 изменённых файлов: 2 добавлений и 11 удалений

Просмотреть файл

@ -101,7 +101,7 @@ class XPCShellRunner(MozbuildObject):
return self._run_xpcshell_harness(**args)
def _run_xpcshell_harness(self, test_dirs=None, manifest=None,
def _run_xpcshell_harness(self, manifest,
test_path=None, shuffle=False, interactive=False,
keep_going=False, sequential=False,
debugger=None, debuggerArgs=None, debuggerInteractive=None,
@ -124,6 +124,7 @@ class XPCShellRunner(MozbuildObject):
verbose_output = test_path is not None or (manifest and len(manifest.test_paths())==1)
args = {
'manifest': manifest,
'xpcshell': os.path.join(self.bindir, 'xpcshell'),
'mozInfo': os.path.join(self.topobjdir, 'mozinfo.json'),
'symbolsPath': os.path.join(self.distdir, 'crashreporter-symbols'),
@ -146,16 +147,6 @@ class XPCShellRunner(MozbuildObject):
if verbose_output else None,
}
if manifest is not None:
args['manifest'] = manifest
elif test_dirs is not None:
if isinstance(test_dirs, list):
args['testdirs'] = test_dirs
else:
args['testdirs'] = [test_dirs]
else:
raise Exception('One of test_dirs or manifest must be provided.')
if test_path is not None:
args['testPath'] = test_path