Bug 1335161 - Removed specific_tests_zip_dirs functionality from mozharness.
MozReview-Commit-ID: KmFIF3rzBBt
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -62,26 +62,16 @@ config = {
"mach",
"marionette/*",
"modules/*",
"mozbase/*",
"tools/*",
"mozpack/*",
"mozbuild/*",
],
- "specific_tests_zip_dirs": {
- "mochitest": ["mochitest/*"],
- "reftest": ["reftest/*", "jsreftest/*"],
- "xpcshell": ["xpcshell/*"],
- "cppunittest": ["cppunittest/*"],
- "gtest": ["gtest/*"],
- "jittest": ["jit-test/*"],
- "mozbase": ["mozbase/*"],
- "mozmill": ["mozmill/*"],
- },
"suite_definitions": {
"cppunittest": {
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(abs_app_dir)s"
],
"run_filename": "runcppunittests.py",
"testsdir": "cppunittest"
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -33,26 +33,16 @@ config = {
"certs/*",
"config/*",
"mach",
"marionette/*",
"modules/*",
"mozbase/*",
"tools/*",
],
- "specific_tests_zip_dirs": {
- "mochitest": ["mochitest/*"],
- "reftest": ["reftest/*", "jsreftest/*"],
- "xpcshell": ["xpcshell/*"],
- "cppunittest": ["cppunittest/*"],
- "gtest": ["gtest/*"],
- "jittest": ["jit-test/*"],
- "mozbase": ["mozbase/*"],
- "mozmill": ["mozmill/*"],
- },
"suite_definitions": {
"cppunittest": {
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(abs_res_dir)s"
],
"run_filename": "runcppunittests.py",
"testsdir": "cppunittest"
--- a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
+++ b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
@@ -57,26 +57,16 @@ config = {
"mach",
"marionette/*",
"modules/*",
"mozbase/*",
"tools/*",
"mozpack/*",
"mozbuild/*",
],
- "specific_tests_zip_dirs": {
- "mochitest": ["mochitest/*"],
- "reftest": ["reftest/*", "jsreftest/*"],
- "xpcshell": ["xpcshell/*"],
- "cppunittest": ["cppunittest/*"],
- "gtest": ["gtest/*"],
- "jittest": ["jit-test/*"],
- "mozbase": ["mozbase/*"],
- "mozmill": ["mozmill/*"],
- },
"suite_definitions": {
"cppunittest": {
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(abs_app_dir)s"
],
"run_filename": "runcppunittests.py",
"testsdir": "cppunittest"
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -49,26 +49,16 @@ config = {
"mach",
"marionette/*",
"modules/*",
"mozbase/*",
"tools/*",
"mozpack/*",
"mozbuild/*",
],
- "specific_tests_zip_dirs": {
- "mochitest": ["mochitest/*"],
- "reftest": ["reftest/*", "jsreftest/*"],
- "xpcshell": ["xpcshell/*"],
- "cppunittest": ["cppunittest/*"],
- "gtest": ["gtest/*"],
- "jittest": ["jit-test/*"],
- "mozbase": ["mozbase/*"],
- "mozmill": ["mozmill/*"],
- },
"suite_definitions": {
"cppunittest": {
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(abs_app_dir)s"
],
"run_filename": "runcppunittests.py",
"testsdir": "cppunittest"
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -571,22 +571,16 @@ class DesktopUnittest(TestingMixin, Merc
def download_and_extract(self):
"""
download and extract test zip / download installer
optimizes which subfolders to extract from tests zip
"""
c = self.config
extract_dirs = None
- if c['specific_tests_zip_dirs']:
- extract_dirs = list(c['minimum_tests_zip_dirs'])
- for category in c['specific_tests_zip_dirs'].keys():
- if c['run_all_suites'] or self._query_specified_suites(category) \
- or 'run-tests' not in self.actions:
- extract_dirs.extend(c['specific_tests_zip_dirs'][category])
if c.get('run_all_suites'):
target_categories = SUITE_CATEGORIES
else:
target_categories = [cat for cat in SUITE_CATEGORIES
if self._query_specified_suites(cat) is not None]
super(DesktopUnittest, self).download_and_extract(extract_dirs=extract_dirs,
suite_categories=target_categories)