From e34ca60662965b7acaeb782e5293acdb50a9d9fa Mon Sep 17 00:00:00 2001 From: James Graham Date: Tue, 18 Aug 2015 17:42:03 +0100 Subject: [PATCH] Bug 1193224 - Remove vestigial --tests-root-dir option from xpcshell tests, r=ahal --- testing/xpcshell/mach_commands.py | 2 -- testing/xpcshell/runxpcshelltests.py | 19 +++++-------------- testing/xpcshell/selftest.py | 1 - 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/testing/xpcshell/mach_commands.py b/testing/xpcshell/mach_commands.py index 7683598147da..ed5084d140a4 100644 --- a/testing/xpcshell/mach_commands.py +++ b/testing/xpcshell/mach_commands.py @@ -162,7 +162,6 @@ class XPCShellRunner(MozbuildObject): 'logfiles': False, 'sequential': sequential, 'shuffle': shuffle, - 'testsRootDir': tests_dir, 'testingModulesDir': modules_dir, 'profileName': 'firefox', 'verbose': verbose or single_test, @@ -388,7 +387,6 @@ class B2GXPCShellRunner(MozbuildObject): options.objdir = self.topobjdir options.symbolsPath = os.path.join(self.distdir, 'crashreporter-symbols'), options.testingModulesDir = os.path.join(self.tests_dir, 'modules') - options.testsRootDir = self.xpcshell_dir options.testPath = test_path options.use_device_libs = True diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py index 3c527ad64a08..763934527a3f 100755 --- a/testing/xpcshell/runxpcshelltests.py +++ b/testing/xpcshell/runxpcshelltests.py @@ -100,7 +100,7 @@ def markGotSIGINT(signum, stackFrame): class XPCShellTestThread(Thread): def __init__(self, test_object, event, cleanup_dir_list, retry=True, - tests_root_dir=None, app_dir_key=None, interactive=False, + app_dir_key=None, interactive=False, verbose=False, pStdout=None, pStderr=None, keep_going=False, log=None, **kwargs): Thread.__init__(self) @@ -130,7 +130,6 @@ class XPCShellTestThread(Thread): self.failureManifest = kwargs.get('failureManifest') self.stack_fixer_function = kwargs.get('stack_fixer_function') - self.tests_root_dir = tests_root_dir self.app_dir_key = app_dir_key self.interactive = interactive self.verbose = verbose @@ -1044,13 +1043,13 @@ class XPCShellTests(object): return '%s:%s' % (os.path.basename(test_object['ancestor-manifest']), path) return path - def runTests(self, xpcshell, xrePath=None, appPath=None, symbolsPath=None, + def runTests(self, xpcshell=None, xrePath=None, appPath=None, symbolsPath=None, manifest=None, testdirs=None, testPath=None, mobileArgs=None, interactive=False, verbose=False, keepGoing=False, logfiles=True, thisChunk=1, totalChunks=1, debugger=None, debuggerArgs=None, debuggerInteractive=False, profileName=None, mozInfo=None, sequential=False, shuffle=False, - testsRootDir=None, testingModulesDir=None, pluginsPath=None, + testingModulesDir=None, pluginsPath=None, testClass=XPCShellTestThread, failureManifest=None, log=None, stream=None, jsDebugger=False, jsDebuggerPort=0, test_tags=None, dump_tests=None, utility_path=None, **otherOptions): @@ -1083,8 +1082,6 @@ class XPCShellTests(object): directory if running only a subset of tests. |mozInfo|, if set, specifies specifies build configuration information, either as a filename containing JSON, or a dict. |shuffle|, if True, execute tests in random order. - |testsRootDir|, absolute path to root directory of all tests. This is used - by xUnit generation to determine the package name of the tests. |testingModulesDir|, if provided, specifies where JS modules reside. xpcshell will register a resource handler mapping this path. |otherOptions| may be present for the convenience of subclasses @@ -1279,13 +1276,10 @@ class XPCShellTests(object): if self.singleFile and not path.endswith(self.singleFile): continue - if self.testPath and path.find(self.testPath) == -1: - continue - self.testCount += 1 test = testClass(test_object, self.event, self.cleanup_dir_list, - tests_root_dir=testsRootDir, app_dir_key=appDirKey, + app_dir_key=appDirKey, interactive=interactive, verbose=verbose or test_object.get("verbose") == "true", pStdout=pStdout, pStderr=pStderr, @@ -1377,7 +1371,7 @@ class XPCShellTests(object): self.log.info("Retrying tests that failed when run in parallel.") for test_object in self.try_again_list: test = testClass(test_object, self.event, self.cleanup_dir_list, - retry=False, tests_root_dir=testsRootDir, + retry=False, app_dir_key=appDirKey, interactive=interactive, verbose=verbose, pStdout=pStdout, pStderr=pStderr, keep_going=keepGoing, log=self.log, mobileArgs=mobileArgs, @@ -1464,9 +1458,6 @@ class XPCShellOptions(OptionParser): self.add_option("--test-path", type="string", dest="testPath", default=None, help="single path and/or test filename to test") - self.add_option("--tests-root-dir", - type="string", dest="testsRootDir", default=None, - help="absolute path to directory where all tests are located. this is typically $(objdir)/_tests") self.add_option("--testing-modules-dir", dest="testingModulesDir", default=None, help="Directory where testing modules are located.") diff --git a/testing/xpcshell/selftest.py b/testing/xpcshell/selftest.py index 5ed4fe6cf220..854d32689759 100644 --- a/testing/xpcshell/selftest.py +++ b/testing/xpcshell/selftest.py @@ -422,7 +422,6 @@ tail = manifest=self.manifest, mozInfo=mozinfo.info, shuffle=shuffle, - testsRootDir=self.tempdir, verbose=verbose, sequential=True, utility_path=self.utility_path),