Bug 1194166 - Update unittest mozconfigs for all platforms, r=chmanchester,jlund

testing/mozharness/configs/android/android_panda_releng.py

@@ -97,8 +97,9 @@ config = {
                 "--http-port=%(http_port)s",
                 "--ssl-port=%(ssl_port)s",
                 "--symbols-path=%(symbols_path)s",
-                "reftest/tests/testing/crashtest/crashtests.list"
+                "--suite=crashtest",
             ],
+            "tests": ["reftest/tests/testing/crashtest/crashtests.list",],
             "run_filename": "remotereftest.py",
             "testsdir": "reftest"
         },
@@ -128,11 +129,12 @@ config = {
                 "--ignore-window-size",
                 "--bootstrap",
                 "--extra-profile-file=jsreftest/tests/user.js",
-                "jsreftest/tests/jstests.list",
                 "--http-port=%(http_port)s",
                 "--ssl-port=%(ssl_port)s",
-                "--symbols-path=%(symbols_path)s"
+                "--symbols-path=%(symbols_path)s",
+                "--suite=jstestbrowser",
             ],
+            "tests": ["jsreftest/tests/jstests.list",],
             "run_filename": "remotereftest.py",
             "testsdir": "reftest"
         },
@@ -166,8 +168,9 @@ config = {
                 "--http-port=%(http_port)s",
                 "--ssl-port=%(ssl_port)s",
                 "--symbols-path=%(symbols_path)s",
-                "reftest/tests/layout/reftests/reftest.list"
+                "--suite=reftest",
             ],
+            "tests": ["reftest/tests/layout/reftests/reftest.list"],
             "run_filename": "remotereftest.py",
             "testsdir": "reftest"
         },

testing/mozharness/configs/android/androidarm.py

@@ -140,8 +140,9 @@ config = {
                 "%(modules_dir)s",
                 "--symbols-path=%(symbols_path)s",
                 "--total-chunks=16",
-                "tests/layout/reftests/reftest.list",
+                "--suite=reftest",
             ],
+            "tests": ["tests/layout/reftests/reftest.list"],
         },
         "crashtest": {
             "run_filename": "remotereftest.py",
@@ -161,8 +162,9 @@ config = {
                 "%(modules_dir)s",
                 "--symbols-path=%(symbols_path)s",
                 "--total-chunks=2",
-                "tests/testing/crashtest/crashtests.list",
+                "--suite=crashtest",
             ],
+            "tests": ["tests/testing/crashtest/crashtests.list"],
         },
         "jsreftest": {
             "run_filename": "remotereftest.py",
@@ -181,10 +183,11 @@ config = {
                 "--httpd-path",
                 "%(modules_dir)s",
                 "--symbols-path=%(symbols_path)s",
-                "../jsreftest/tests/jstests.list",
                 "--total-chunks=6",
                 "--extra-profile-file=jsreftest/tests/user.js",
+                "--suite=jstestbrowser",
             ],
+            "tests": ["../jsreftest/tests/jstests.list"],
         },
         "xpcshell": {
             "run_filename": "remotexpcshelltests.py",
@@ -315,83 +318,67 @@ config = {
         },
         "reftest-1": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=1",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=1"],
         },
         "reftest-2": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=2",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=2"],
         },
         "reftest-3": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=3",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=3"],
         },
         "reftest-4": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=4",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=4"],
         },
         "reftest-5": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=5",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=5"],
         },
         "reftest-6": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=6",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=6"],
         },
         "reftest-7": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=7",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=7"],
         },
         "reftest-8": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=8",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=8"],
         },
         "reftest-9": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=9",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=9"],
         },
         "reftest-10": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=10",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=10"],
         },
         "reftest-11": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=11",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=11"],
         },
         "reftest-12": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=12",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=12"],
         },
         "reftest-13": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=13",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=13"],
         },
         "reftest-14": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=14",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=14"],
         },
         "reftest-15": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=15",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=15"],
         },
         "reftest-16": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=16", "--this-chunk=16",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=16", "--this-chunk=16"],
         },
         "crashtest-1": {
             "category": "crashtest",

testing/mozharness/configs/android/androidarm_4_3.py

@@ -138,8 +138,9 @@ config = {
                 "--httpd-path", "%(modules_dir)s",
                 "--symbols-path=%(symbols_path)s",
                 "--total-chunks=16",
-                "tests/layout/reftests/reftest.list",
+                "--suite=reftest",
             ],
+            "tests": ["tests/layout/reftests/reftest.list",],
         },
         "crashtest": {
             "run_filename": "remotereftest.py",
@@ -158,8 +159,9 @@ config = {
                 "%(modules_dir)s",
                 "--symbols-path=%(symbols_path)s",
                 "--total-chunks=2",
-                "tests/testing/crashtest/crashtests.list",
+                "--suite=crashtest",
             ],
+            "tests": ["tests/testing/crashtest/crashtests.list",],
         },
         "jsreftest": {
             "run_filename": "remotereftest.py",
@@ -173,10 +175,11 @@ config = {
                 "--utility-path=%(utility_path)s", "--http-port=%(http_port)s",
                 "--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s",
                 "--symbols-path=%(symbols_path)s",
-                "../jsreftest/tests/jstests.list",
                 "--total-chunks=6",
                 "--extra-profile-file=jsreftest/tests/user.js",
+                "--suite=jstestbrowser",
             ],
+            "tests": ["../jsreftest/tests/jstests.list",],
         },
         "xpcshell": {
             "run_filename": "remotexpcshelltests.py",
@@ -375,243 +378,195 @@ config = {
         },
         "reftest-1": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=1",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=1"],
         },
         "reftest-2": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=2",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=2"],
         },
         "reftest-3": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=3",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=3"],
         },
         "reftest-4": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=4",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=4"],
         },
         "reftest-5": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=5",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=5"],
         },
         "reftest-6": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=6",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=6"],
         },
         "reftest-7": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=7",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=7"],
         },
         "reftest-8": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=8",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=8"],
         },
         "reftest-9": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=9",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=9"],
         },
         "reftest-10": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=10",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=10"],
         },
         "reftest-11": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=11",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=11"],
         },
         "reftest-12": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=12",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=12"],
         },
         "reftest-13": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=13",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=13"],
         },
         "reftest-14": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=14",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=14"],
         },
         "reftest-15": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=15",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=15"],
         },
         "reftest-16": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=16",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": ["--total-chunks=48", "--this-chunk=16"],
         },
         "reftest-17": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=17",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=17"],
         },
        "reftest-18": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=18",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=18"],
         },
         "reftest-19": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=19",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=19"],
         },
         "reftest-20": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=20",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=20"],
         },
         "reftest-21": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=21",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=21"],
         },
         "reftest-22": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=22",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=22"],
         },
         "reftest-23": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=23",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=23"],
         },
         "reftest-24": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=24",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=24"],
         },
         "reftest-25": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=25",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=25"],
         },
         "reftest-26": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=26",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=26"],
         },
         "reftest-27": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=27",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=27"],
         },
         "reftest-28": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=28",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=28"],
         },
         "reftest-29": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=29",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=29"],
         },
         "reftest-30": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=30",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=30"],
         },
         "reftest-31": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=31",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=31"],
         },
         "reftest-32": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=32",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=32"],
         },
         "reftest-33": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=33",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=33"],
         },
         "reftest-34": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=34",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=34"],
         },
         "reftest-35": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=35",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=35"],
         },
         "reftest-36": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=36",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=36"],
         },
         "reftest-37": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=37",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=37"],
         },
         "reftest-38": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=38",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=38"],
         },
         "reftest-39": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=39",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=39"],
         },
         "reftest-40": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=40",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=40"],
         },
         "reftest-41": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=41",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=41"],
         },
         "reftest-42": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=42",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=42"],
         },
         "reftest-43": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=43",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=43"],
         },
         "reftest-44": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=44",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=44"],
         },
         "reftest-45": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=45",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=45"],
         },
         "reftest-46": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=46",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=46"],
         },
         "reftest-47": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=47",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=47"],
         },
         "reftest-48": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=48", "--this-chunk=48",
-            "tests/layout/reftests/reftest.list"]
+            "extra args": ["--total-chunks=48", "--this-chunk=48"],
         },
         "crashtest-1": {
             "category": "crashtest",

testing/mozharness/configs/android/androidx86.py

@@ -135,8 +135,11 @@ config = {
     "test_suite_definitions": {
         "jsreftest": {
             "category": "reftest",
-            "extra_args": ["../jsreftest/tests/jstests.list",
-                "--extra-profile-file=jsreftest/tests/user.js"]
+            "tests": ["../jsreftest/tests/jstests.list"],
+            "extra_args": [
+                "--suite=jstestbrowser",
+                "--extra-profile-file=jsreftest/tests/user.js"
+            ]
         },
         "mochitest-1": {
             "category": "mochitest",
@@ -152,22 +155,33 @@ config = {
         },
         "reftest-1": {
             "category": "reftest",
-            "extra_args": ["--total-chunks=3", "--this-chunk=1",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": [
+                "--suite=reftest",
+                "--total-chunks=3",
+                "--this-chunk=1",
+            ],
+            "tests": ["tests/layout/reftests/reftest.list"],
         },
         "reftest-2": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks=3", "--this-chunk=2",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": [
+                "--suite=reftest",
+                "--total-chunks=3",
+                "--this-chunk=2",
+            ],
+            "tests": ["tests/layout/reftests/reftest.list"],
         },
         "reftest-3": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks=3", "--this-chunk=3",
-                "tests/layout/reftests/reftest.list"]
+            "extra_args": [
+                "--suite=reftest",
+                "--total-chunks=3",
+                "--this-chunk=3",
+            ],
+            "tests": ["tests/layout/reftests/reftest.list"],
         },
         "crashtest": {
             "category": "reftest",
-            "extra_args": ["tests/testing/crashtest/crashtests.list"]
+            "extra_args": ["--suite=crashtest"],
+            "tests": ["tests/testing/crashtest/crashtests.list"]
         },
         "xpcshell": {
             "category": "xpcshell",

testing/mozharness/configs/b2g/emulator_automation_config.py

@@ -74,8 +74,9 @@ config = {
                 "--busybox=%(busybox)s",
                 "--total-chunks=%(total_chunks)s",
                 "--this-chunk=%(this_chunk)s",
-                "tests/testing/crashtest/crashtests.list"
+                "--suite=crashtest",
             ],
+            "tests": ["tests/testing/crashtest/crashtests.list",],
             "run_filename": "runreftestb2g.py",
             "testsdir": "reftest"
         },
@@ -94,8 +95,8 @@ config = {
                 "--total-chunks=%(total_chunks)s",
                 "--this-chunk=%(this_chunk)s",
                 "--extra-profile-file=jsreftest/tests/user.js",
-                "jsreftest/tests/jstests.list"
             ],
+            "tests": ["jsreftest/tests/jstests.list",],
             "run_filename": "remotereftest.py",
             "testsdir": "reftest"
         },
@@ -161,8 +162,8 @@ config = {
                 "--total-chunks=%(total_chunks)s",
                 "--this-chunk=%(this_chunk)s",
                 "--enable-oop",
-                "tests/layout/reftests/reftest.list"
             ],
+            "tests": ["tests/layout/reftests/reftest.list",],
             "run_filename": "runreftestsb2g.py",
             "testsdir": "reftest"
         },

testing/mozharness/configs/unittests/linux_unittest.py

@@ -2,14 +2,14 @@ import os
 import platform
 
 # OS Specifics
-ABS_WORK_DIR = os.path.join(os.getcwd(), 'build')
+ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
 BINARY_PATH = os.path.join(ABS_WORK_DIR, "firefox", "firefox-bin")
 INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.tar.bz2")
 XPCSHELL_NAME = "xpcshell"
-EXE_SUFFIX = ''
+EXE_SUFFIX = ""
 DISABLE_SCREEN_SAVER = True
 ADJUST_MOUSE_AND_SCREEN = False
-if platform.architecture()[0] == '64bit':
+if platform.architecture()[0] == "64bit":
     TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux64/releng.manifest"
     MINIDUMP_STACKWALK_PATH = "linux64-minidump_stackwalk"
 else:
@@ -20,9 +20,9 @@ else:
 config = {
     "buildbot_json_path": "buildprops.json",
     "exes": {
-        'python': '/tools/buildbot/bin/python',
-        'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
-        'tooltool.py': "/tools/tooltool.py",
+        "python": "/tools/buildbot/bin/python",
+        "virtualenv": ["/tools/buildbot/bin/python", "/tools/misc-python/virtualenv.py"],
+        "tooltool.py": "/tools/tooltool.py",
     },
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
@@ -200,37 +200,63 @@ config = {
     },
     # local reftest suites
     "all_reftest_suites": {
-        "reftest": ["tests/reftest/tests/layout/reftests/reftest.list"],
-        "crashtest": ["tests/reftest/tests/testing/crashtest/crashtests.list"],
-        "jsreftest": ["--extra-profile-file=tests/jsreftest/tests/user.js", "tests/jsreftest/tests/jstests.list"],
-        "reftest-ipc": {'env': {'MOZ_OMTC_ENABLED': '1',
-                                'MOZ_DISABLE_CONTEXT_SHARING_GLX': '1'},
-                        'options': ['--setpref=browser.tabs.remote=true',
-                                    '--setpref=browser.tabs.remote.autostart=true',
-                                    '--setpref=layers.offmainthreadcomposition.testing.enabled=true',
-                                    '--setpref=layers.async-pan-zoom.enabled=true',
-                                    'tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list']},
-        "reftest-no-accel": ['--setpref=layers.acceleration.force-enabled=disabled',
-                             'tests/reftest/tests/layout/reftests/reftest.list'],
-        "crashtest-ipc": {'env': {'MOZ_OMTC_ENABLED': '1',
-                                  'MOZ_DISABLE_CONTEXT_SHARING_GLX': '1'},
-                          'options': ['--setpref=browser.tabs.remote=true',
-                                      '--setpref=browser.tabs.remote.autostart=true',
-                                      '--setpref=layers.offmainthreadcomposition.testing.enabled=true',
-                                      '--setpref=layers.async-pan-zoom.enabled=true',
-                                      'tests/reftest/tests/testing/crashtest/crashtests.list']},
+        "reftest": {
+            "options": ["--suite=reftest"],
+            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
+        },
+        "crashtest": {
+            "options": ["--suite=crashtest"],
+            "tests": ["tests/reftest/tests/testing/crashtest/crashtests.list"]
+        },
+        "jsreftest": {
+            "options":["--extra-profile-file=tests/jsreftest/tests/user.js",
+                       "--suite=jstestbrowser"],
+            "tests": ["tests/jsreftest/tests/jstests.list"]
+        },
+        "reftest-ipc": {
+            "env": {
+                "MOZ_OMTC_ENABLED": "1",
+                "MOZ_DISABLE_CONTEXT_SHARING_GLX": "1"
+            },
+            "options": ["--suite=reftest",
+                        "--setpref=browser.tabs.remote=true",
+                        "--setpref=browser.tabs.remote.autostart=true",
+                        "--setpref=layers.offmainthreadcomposition.testing.enabled=true",
+                        "--setpref=layers.async-pan-zoom.enabled=true"],
+            "tests": ["tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list"]
+        },
+        "reftest-no-accel": {
+            "options": ["--suite=reftest",
+                        "--setpref=layers.acceleration.force-enabled=disabled"],
+            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]},
+        "crashtest-ipc": {
+            "env": {
+                "MOZ_OMTC_ENABLED": "1",
+                "MOZ_DISABLE_CONTEXT_SHARING_GLX": "1"
+            },
+            "options": ["--suite=crashtest",
+                        "--setpref=browser.tabs.remote=true",
+                        "--setpref=browser.tabs.remote.autostart=true",
+                        "--setpref=layers.offmainthreadcomposition.testing.enabled=true",
+                        "--setpref=layers.async-pan-zoom.enabled=true"],
+            "tests": ["tests/reftest/tests/testing/crashtest/crashtests.list"]
+        },
     },
     "all_xpcshell_suites": {
-        "xpcshell": {'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
-                                 "--manifest=tests/xpcshell/tests/all-test-dirs.list"],
-                     'tests': []},
-        "xpcshell-addons": {'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
-                                        "--manifest=tests/xpcshell/tests/all-test-dirs.list",
-                                        "--tag=addons"],
-                            'tests': []}
+        "xpcshell": {
+            "options": ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
+                        "--manifest=tests/xpcshell/tests/all-test-dirs.list"],
+            "tests": []
+        },
+        "xpcshell-addons": {
+            "options": ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
+                        "--tag=addons",
+                        "--manifest=tests/xpcshell/tests/all-test-dirs.list"],
+            "tests": []
+        },
     },
     "all_cppunittest_suites": {
-        "cppunittest": ['tests/cppunittest']
+        "cppunittest": ["tests/cppunittest"]
     },
     "all_gtest_suites": {
         "gtest": []

testing/mozharness/configs/unittests/mac_unittest.py

@@ -167,24 +167,45 @@ config = {
     },
     # local reftest suites
     "all_reftest_suites": {
-        "reftest": ["tests/reftest/tests/layout/reftests/reftest.list"],
-        "crashtest": ["tests/reftest/tests/testing/crashtest/crashtests.list"],
-        "jsreftest": ["--extra-profile-file=tests/jsreftest/tests/user.js", "tests/jsreftest/tests/jstests.list"],
-        "reftest-ipc": ['--setpref=browser.tabs.remote=true',
+        "reftest": {
+            'options': ["--suite=reftest"],
+            'tests': ["tests/reftest/tests/layout/reftests/reftest.list"]
+        },
+        "crashtest": {
+            'options': ["--suite=crashtest"],
+            'tests': ["tests/reftest/tests/testing/crashtest/crashtests.list"]
+        },
+        "jsreftest": {
+            'options':["--extra-profile-file=tests/jsreftest/tests/user.js"],
+            'tests': ["tests/jsreftest/tests/jstests.list"]
+        },
+        "reftest-ipc": {
+            'options': ['--suite=reftest',
+                        '--setpref=browser.tabs.remote=true',
                         '--setpref=browser.tabs.remote.autostart=true',
-                        '--setpref=layers.async-pan-zoom.enabled=true',
-                        'tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list'],
-        "crashtest-ipc": ['--setpref=browser.tabs.remote=true',
-                          '--setpref=browser.tabs.remote.autostart=true',
-                          '--setpref=layers.async-pan-zoom.enabled=true',
-                          'tests/reftest/tests/testing/crashtest/crashtests.list'],
+                        '--setpref=layers.async-pan-zoom.enabled=true'],
+            'tests': ['tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list']
+        },
+        "crashtest-ipc": {
+            'options': ['--suite=crashtest',
+                        '--setpref=browser.tabs.remote=true',
+                        '--setpref=browser.tabs.remote.autostart=true',
+                        '--setpref=layers.async-pan-zoom.enabled=true'],
+            'tests': ['tests/reftest/tests/testing/crashtest/crashtests.list']
+        },
     },
     "all_xpcshell_suites": {
-        "xpcshell": ["--manifest=tests/xpcshell/tests/all-test-dirs.list",
-                     "%(abs_app_dir)s/" + XPCSHELL_NAME],
-        "xpcshell-addons": ["--manifest=tests/xpcshell/tests/all-test-dirs.list",
-                            "--tag=addons",
-                            "%(abs_app_dir)s/" + XPCSHELL_NAME]
+        "xpcshell": {
+            'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
+                        "--manifest=tests/xpcshell/tests/all-test-dirs.list"],
+            'tests': []
+        },
+        "xpcshell-addons": {
+            'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
+                        "--tag=addons",
+                        "--manifest=tests/xpcshell/tests/all-test-dirs.list"],
+            'tests': []
+        },
     },
     "all_cppunittest_suites": {
         "cppunittest": ['tests/cppunittest']

testing/mozharness/configs/unittests/win_unittest.py

@@ -177,28 +177,56 @@ config = {
     },
     # local reftest suites
     "all_reftest_suites": {
-        "reftest": ["tests/reftest/tests/layout/reftests/reftest.list"],
-        "crashtest": ["tests/reftest/tests/testing/crashtest/crashtests.list"],
-        "jsreftest": ["--extra-profile-file=tests/jsreftest/tests/user.js", "tests/jsreftest/tests/jstests.list"],
-        "reftest-ipc": ['--setpref=browser.tabs.remote=true',
+        "reftest": {
+            'options': ["--suite=reftest"],
+            'tests': ["tests/reftest/tests/layout/reftests/reftest.list"]
+        },
+        "crashtest": {
+            'options': ["--suite=crashtest"],
+            'tests': ["tests/reftest/tests/testing/crashtest/crashtests.list"]
+        },
+        "jsreftest": {
+            'options':["--extra-profile-file=tests/jsreftest/tests/user.js"],
+            'tests': ["tests/jsreftest/tests/jstests.list"]
+        },
+        "reftest-ipc": {
+            'options': ['--suite=reftest',
+                        '--setpref=browser.tabs.remote=true',
                         '--setpref=browser.tabs.remote.autostart=true',
-                        '--setpref=layers.async-pan-zoom.enabled=true',
-                        'tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list'],
-        "reftest-no-accel": ["--setpref=gfx.direct2d.disabled=true", "--setpref=layers.acceleration.disabled=true",
-                             "tests/reftest/tests/layout/reftests/reftest.list"],
-        "reftest-omtc": ["--setpref=layers.offmainthreadcomposition.enabled=true",
-                         "tests/reftest/tests/layout/reftests/reftest.list"],
-        "crashtest-ipc": ['--setpref=browser.tabs.remote=true',
-                          '--setpref=browser.tabs.remote.autostart=true',
-                          '--setpref=layers.async-pan-zoom.enabled=true',
-                          'tests/reftest/tests/testing/crashtest/crashtests.list'],
+                        '--setpref=layers.async-pan-zoom.enabled=true'],
+            'tests': ['tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list']
+        },
+        "reftest-no-accel": {
+            "options": ["--suite=reftest",
+                        "--setpref=gfx.direct2d.disabled=true",
+                        "--setpref=layers.acceleration.disabled=true"],
+            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
+        },
+        "reftest-omtc": {
+            "options": ["--suite=reftest",
+                        "--setpref=layers.offmainthreadcomposition.enabled=true"],
+            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
+        },
+        "crashtest-ipc": {
+            "options": ["--suite=crashtest",
+                        '--setpref=browser.tabs.remote=true',
+                        '--setpref=browser.tabs.remote.autostart=true',
+                        '--setpref=layers.async-pan-zoom.enabled=true'],
+            "tests": ['tests/reftest/tests/testing/crashtest/crashtests.list'],
+        },
     },
     "all_xpcshell_suites": {
-        "xpcshell": ["--manifest=tests/xpcshell/tests/all-test-dirs.list",
-                     "%(abs_app_dir)s/" + XPCSHELL_NAME],
-        "xpcshell-addons": ["--manifest=tests/xpcshell/tests/all-test-dirs.list",
-                            "--tag=addons",
-                            "%(abs_app_dir)s/" + XPCSHELL_NAME]
+        "xpcshell": {
+            'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
+                        "--manifest=tests/xpcshell/tests/all-test-dirs.list"],
+            'tests': []
+        },
+        "xpcshell-addons": {
+            'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
+                        "--tag=addons",
+                        "--manifest=tests/xpcshell/tests/all-test-dirs.list"],
+            'tests': []
+        },
     },
     "all_cppunittest_suites": {
         "cppunittest": ['tests/cppunittest']

testing/mozharness/scripts/android_emulator_unittest.py

@@ -483,6 +483,15 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin
                 continue
             cmd.append(arg)
 
+        tests = None
+        if "tests" in self.test_suite_definitions[self.test_suite]:
+            tests = self.test_suite_definitions[self.test_suite]["tests"]
+        elif "tests" in self.config["suite_definitions"][suite_category]:
+            tests = self.config["suite_definitions"][suite_category]["tests"]
+
+        if tests:
+            cmd.extend(tests)
+
         return cmd
 
     def _tooltool_fetch(self, url):

testing/mozharness/scripts/android_panda.py

@@ -252,6 +252,9 @@ class PandaTest(TestingMixin, MercurialScript, BlobUploadMixin, MozpoolMixin, Bu
 
                 cmd = self.append_harness_extra_args(cmd)
 
+                tests = self.config["suite_definitions"][suite_category].get("tests", [])
+                cmd += tests
+
                 tbpl_status, log_level = None, None
                 error_list = BaseErrorList + [{
                     'regex': re.compile(r"(?:TEST-UNEXPECTED-FAIL|PROCESS-CRASH) \| .* \| (application crashed|missing output line for total leaks!|negative leaks caught!|\d+ bytes leaked)"),

testing/mozharness/scripts/androidx86_emulator_unittest.py

@@ -452,6 +452,11 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin
                 continue
             cmd.append(arg)
 
+        if "tests" in self.test_suite_definitions[suite_name]:
+            cmd.extend(self.suite_definitions[suite_name]["tests"])
+        elif "tests" in c["suite_definitions"][suite_category]:
+            cmd.extend(self.config["suite_definitions"][suite_category]["tests"])
+
         return cmd
 
     def preflight_run_tests(self):

testing/mozharness/scripts/b2g_desktop_unittest.py

@@ -154,7 +154,7 @@ class B2GDesktopTest(BlobUploadMixin, TestingMixin, MercurialScript):
         }
 
         if suite not in self.config["suite_definitions"]:
-            self.fatal("'%s' not defined in the config!" % suite),
+            self.fatal("'%s' not defined in the config!" % suite)
 
         options = self.config["suite_definitions"][suite]["options"]
         if options:
@@ -162,6 +162,11 @@ class B2GDesktopTest(BlobUploadMixin, TestingMixin, MercurialScript):
                 option = option % str_format_values
                 if not option.endswith('None'):
                     cmd.append(option)
+
+        tests = self.config["suite_definitions"][suite].get("tests")
+        if tests:
+            cmd.extend(tests)
+
         return cmd
 
     def download_and_extract(self):

testing/mozharness/scripts/b2g_emulator_unittest.py

@@ -281,6 +281,11 @@ class B2GEmulatorTest(TestingMixin, VCSMixin, BaseScript, BlobUploadMixin):
                 option = option % str_format_values
                 if not option.endswith('None'):
                     cmd.append(option)
+
+        tests = self.config["suite_definitions"][suite].get("tests", [])
+        if tests:
+            cmd.extend(tests)
+
         return cmd
 
     def _query_adb(self):
@@ -336,9 +341,10 @@ class B2GEmulatorTest(TestingMixin, VCSMixin, BaseScript, BlobUploadMixin):
             self.fatal("Don't know how to run --test-suite '%s'!" % suite)
 
         cmd = self._query_abs_base_cmd(suite)
-        cwd = dirs['abs_%s_dir' % suite]
         cmd = self.append_harness_extra_args(cmd)
 
+        cwd = dirs['abs_%s_dir' % suite]
+
         # TODO we probably have to move some of the code in
         # scripts/desktop_unittest.py and scripts/marionette.py to
         # mozharness.mozilla.testing.unittest so we can share it.

testing/mozharness/scripts/desktop_unittest.py

@@ -588,8 +588,8 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
                 options_list = []
                 env = {}
                 if isinstance(suites[suite], dict):
-                    options_list = suites[suite]['options']
-                    env = copy.deepcopy(suites[suite]['env'])
+                    options_list = suites[suite]['options'] + suites[suite].get("tests", [])
+                    env = copy.deepcopy(suites[suite].get('env', {}))
                 else:
                     options_list = suites[suite]