--- a/configs/android/androidarm.py
+++ b/configs/android/androidarm.py
@@ -48,16 +48,43 @@ config = {
{
"name": "test-1",
"device_id": "emulator-5554",
"http_port": "8854", # starting http port to use for the mochitest server
"ssl_port": "4454", # starting ssl port to use for the server
"emulator_port": 5554,
"sut_port1": 20701,
"sut_port2": 20700
+ },
+ {
+ "name": "test-2",
+ "device_id": "emulator-5556",
+ "http_port": "8856", # starting http port to use for the mochitest server
+ "ssl_port": "4456", # starting ssl port to use for the server
+ "emulator_port": 5556,
+ "sut_port1": 20703,
+ "sut_port2": 20702
+ },
+ {
+ "name": "test-3",
+ "device_id": "emulator-5558",
+ "http_port": "8858", # starting http port to use for the mochitest server
+ "ssl_port": "4458", # starting ssl port to use for the server
+ "emulator_port": 5558,
+ "sut_port1": 20705,
+ "sut_port2": 20704
+ },
+ {
+ "name": "test-4",
+ "device_id": "emulator-5560",
+ "http_port": "8860", # starting http port to use for the mochitest server
+ "ssl_port": "4460", # starting ssl port to use for the server
+ "emulator_port": 5560,
+ "sut_port1": 20707,
+ "sut_port2": 20706
}
],
"test_suite_definitions": {
"jsreftest-1": {
"category": "jsreftest",
"extra_args": ["--this-chunk=1"],
},
"jsreftest-2": {
@@ -75,103 +102,79 @@ config = {
"jsreftest-5": {
"category": "jsreftest",
"extra_args": ["--this-chunk=5"],
},
"jsreftest-6": {
"category": "jsreftest",
"extra_args": ["--this-chunk=6"],
},
- "jsreftest-7": {
- "category": "jsreftest",
- "extra_args": ["--this-chunk=7"],
- },
- "jsreftest-8": {
- "category": "jsreftest",
- "extra_args": ["--this-chunk=8"],
- },
"mochitest-1": {
"category": "mochitest",
- "extra_args": ["--this-chunk=1"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=1"],
},
"mochitest-2": {
"category": "mochitest",
- "extra_args": ["--this-chunk=2"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=2"],
},
"mochitest-3": {
"category": "mochitest",
- "extra_args": ["--this-chunk=3"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=3"],
},
"mochitest-4": {
"category": "mochitest",
- "extra_args": ["--this-chunk=4"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=4"],
},
"mochitest-5": {
"category": "mochitest",
- "extra_args": ["--this-chunk=5"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=5"],
},
"mochitest-6": {
"category": "mochitest",
- "extra_args": ["--this-chunk=6"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=6"],
},
"mochitest-7": {
"category": "mochitest",
- "extra_args": ["--this-chunk=7"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=7"],
},
"mochitest-8": {
"category": "mochitest",
- "extra_args": ["--this-chunk=8"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=8"],
},
"mochitest-9": {
"category": "mochitest",
- "extra_args": ["--this-chunk=9"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=9"],
},
"mochitest-10": {
"category": "mochitest",
- "extra_args": ["--this-chunk=10"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=10"],
},
"mochitest-11": {
"category": "mochitest",
- "extra_args": ["--this-chunk=11"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=11"],
},
"mochitest-12": {
"category": "mochitest",
- "extra_args": ["--this-chunk=12"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=12"],
},
"mochitest-13": {
"category": "mochitest",
- "extra_args": ["--this-chunk=13"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=13"],
},
"mochitest-14": {
"category": "mochitest",
- "extra_args": ["--this-chunk=14"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=14"],
},
"mochitest-15": {
"category": "mochitest",
- "extra_args": ["--this-chunk=15"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=15"],
},
"mochitest-16": {
"category": "mochitest",
- "extra_args": ["--this-chunk=16"],
- },
- "mochitest-17": {
- "category": "mochitest",
- "extra_args": ["--this-chunk=17"],
- },
- "mochitest-18": {
- "category": "mochitest",
- "extra_args": ["--this-chunk=18"],
- },
- "mochitest-19": {
- "category": "mochitest",
- "extra_args": ["--this-chunk=19"],
- },
- "mochitest-20": {
- "category": "mochitest",
- "extra_args": ["--this-chunk=20"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=16"],
},
"mochitest-gl-1": {
"category": "mochitest-gl",
"extra_args": ["--this-chunk=1"],
},
"mochitest-gl-2": {
"category": "mochitest-gl",
"extra_args": ["--this-chunk=2"],
@@ -181,125 +184,113 @@ config = {
"extra_args": ["--this-chunk=3"],
},
"mochitest-gl-4": {
"category": "mochitest-gl",
"extra_args": ["--this-chunk=4"],
},
"reftest-1": {
"category": "reftest",
- "extra_args": ["--this-chunk=1"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=1",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-2": {
"category": "reftest",
- "extra_args": ["--this-chunk=2"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=2",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-3": {
"category": "reftest",
- "extra_args": ["--this-chunk=3"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=3",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-4": {
"category": "reftest",
- "extra_args": ["--this-chunk=4"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=4",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-5": {
"category": "reftest",
- "extra_args": ["--this-chunk=5"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=5",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-6": {
"category": "reftest",
- "extra_args": ["--this-chunk=6"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=6",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-7": {
"category": "reftest",
- "extra_args": ["--this-chunk=7"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=7",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-8": {
"category": "reftest",
- "extra_args": ["--this-chunk=8"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=8",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-9": {
"category": "reftest",
- "extra_args": ["--this-chunk=9"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=9",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-10": {
"category": "reftest",
- "extra_args": ["--this-chunk=10"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=10",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-11": {
"category": "reftest",
- "extra_args": ["--this-chunk=11"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=11",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-12": {
"category": "reftest",
- "extra_args": ["--this-chunk=12"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=12",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-13": {
"category": "reftest",
- "extra_args": ["--this-chunk=13"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=13",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-14": {
"category": "reftest",
- "extra_args": ["--this-chunk=14"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=14",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-15": {
"category": "reftest",
- "extra_args": ["--this-chunk=15"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=15",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-16": {
"category": "reftest",
- "extra_args": ["--this-chunk=16"],
- },
- "reftest-17": {
- "category": "reftest",
- "extra_args": ["--this-chunk=17"],
- },
- "reftest-18": {
- "category": "reftest",
- "extra_args": ["--this-chunk=18"],
- },
- "reftest-19": {
- "category": "reftest",
- "extra_args": ["--this-chunk=19"],
- },
- "reftest-20": {
- "category": "reftest",
- "extra_args": ["--this-chunk=20"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=16",
+ "tests/layout/reftests/reftest.list"]
},
"crashtest-1": {
"category": "crashtest",
"extra_args": ["--this-chunk=1"],
},
"crashtest-2": {
"category": "crashtest",
"extra_args": ["--this-chunk=2"],
},
"xpcshell-1": {
"category": "xpcshell",
- "extra_args": ["--this-chunk=1"],
+ "extra_args": ["--total-chunks=3", "--this-chunk=1"],
},
"xpcshell-2": {
"category": "xpcshell",
- "extra_args": ["--this-chunk=2"],
+ "extra_args": ["--total-chunks=3", "--this-chunk=2"],
},
"xpcshell-3": {
"category": "xpcshell",
- "extra_args": ["--this-chunk=3"],
- },
- "xpcshell-4": {
- "category": "xpcshell",
- "extra_args": ["--this-chunk=4"],
- },
- "xpcshell-5": {
- "category": "xpcshell",
- "extra_args": ["--this-chunk=5"],
- },
- "xpcshell-6": {
- "category": "xpcshell",
- "extra_args": ["--this-chunk=6"],
+ "extra_args": ["--total-chunks=3", "--this-chunk=3"],
},
"robocop-1": {
"category": "robocop",
"extra_args": ["--this-chunk=1"],
},
"robocop-2": {
"category": "robocop",
"extra_args": ["--this-chunk=2"],
@@ -307,32 +298,16 @@ config = {
"robocop-3": {
"category": "robocop",
"extra_args": ["--this-chunk=3"],
},
"robocop-4": {
"category": "robocop",
"extra_args": ["--this-chunk=4"],
},
- "robocop-5": {
- "category": "robocop",
- "extra_args": ["--this-chunk=5"],
- },
- "robocop-6": {
- "category": "robocop",
- "extra_args": ["--this-chunk=6"],
- },
- "robocop-7": {
- "category": "robocop",
- "extra_args": ["--this-chunk=7"],
- },
- "robocop-8": {
- "category": "robocop",
- "extra_args": ["--this-chunk=8"],
- },
}, # end of "test_definitions"
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/android_arm_config.py",
"download_minidump_stackwalk": True,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
--- a/configs/android/androidarm_4_3.py
+++ b/configs/android/androidarm_4_3.py
@@ -81,103 +81,79 @@ config = {
"jsreftest-5": {
"category": "jsreftest",
"extra_args": ["--this-chunk=5"],
},
"jsreftest-6": {
"category": "jsreftest",
"extra_args": ["--this-chunk=6"],
},
- "jsreftest-7": {
- "category": "jsreftest",
- "extra_args": ["--this-chunk=7"],
- },
- "jsreftest-8": {
- "category": "jsreftest",
- "extra_args": ["--this-chunk=8"],
- },
"mochitest-1": {
"category": "mochitest",
- "extra_args": ["--this-chunk=1"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=1"],
},
"mochitest-2": {
"category": "mochitest",
- "extra_args": ["--this-chunk=2"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=2"],
},
"mochitest-3": {
"category": "mochitest",
- "extra_args": ["--this-chunk=3"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=3"],
},
"mochitest-4": {
"category": "mochitest",
- "extra_args": ["--this-chunk=4"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=4"],
},
"mochitest-5": {
"category": "mochitest",
- "extra_args": ["--this-chunk=5"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=5"],
},
"mochitest-6": {
"category": "mochitest",
- "extra_args": ["--this-chunk=6"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=6"],
},
"mochitest-7": {
"category": "mochitest",
- "extra_args": ["--this-chunk=7"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=7"],
},
"mochitest-8": {
"category": "mochitest",
- "extra_args": ["--this-chunk=8"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=8"],
},
"mochitest-9": {
"category": "mochitest",
- "extra_args": ["--this-chunk=9"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=9"],
},
"mochitest-10": {
"category": "mochitest",
- "extra_args": ["--this-chunk=10"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=10"],
},
"mochitest-11": {
"category": "mochitest",
- "extra_args": ["--this-chunk=11"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=11"],
},
"mochitest-12": {
"category": "mochitest",
- "extra_args": ["--this-chunk=12"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=12"],
},
"mochitest-13": {
"category": "mochitest",
- "extra_args": ["--this-chunk=13"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=13"],
},
"mochitest-14": {
"category": "mochitest",
- "extra_args": ["--this-chunk=14"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=14"],
},
"mochitest-15": {
"category": "mochitest",
- "extra_args": ["--this-chunk=15"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=15"],
},
"mochitest-16": {
"category": "mochitest",
- "extra_args": ["--this-chunk=16"],
- },
- "mochitest-17": {
- "category": "mochitest",
- "extra_args": ["--this-chunk=17"],
- },
- "mochitest-18": {
- "category": "mochitest",
- "extra_args": ["--this-chunk=18"],
- },
- "mochitest-19": {
- "category": "mochitest",
- "extra_args": ["--this-chunk=19"],
- },
- "mochitest-20": {
- "category": "mochitest",
- "extra_args": ["--this-chunk=20"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=16"],
},
"mochitest-gl-1": {
"category": "mochitest-gl",
"extra_args": ["--this-chunk=1"],
},
"mochitest-gl-2": {
"category": "mochitest-gl",
"extra_args": ["--this-chunk=2"],
@@ -187,125 +163,113 @@ config = {
"extra_args": ["--this-chunk=3"],
},
"mochitest-gl-4": {
"category": "mochitest-gl",
"extra_args": ["--this-chunk=4"],
},
"reftest-1": {
"category": "reftest",
- "extra_args": ["--this-chunk=1"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=1",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-2": {
"category": "reftest",
- "extra_args": ["--this-chunk=2"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=2",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-3": {
"category": "reftest",
- "extra_args": ["--this-chunk=3"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=3",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-4": {
"category": "reftest",
- "extra_args": ["--this-chunk=4"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=4",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-5": {
"category": "reftest",
- "extra_args": ["--this-chunk=5"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=5",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-6": {
"category": "reftest",
- "extra_args": ["--this-chunk=6"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=6",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-7": {
"category": "reftest",
- "extra_args": ["--this-chunk=7"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=7",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-8": {
"category": "reftest",
- "extra_args": ["--this-chunk=8"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=8",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-9": {
"category": "reftest",
- "extra_args": ["--this-chunk=9"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=9",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-10": {
"category": "reftest",
- "extra_args": ["--this-chunk=10"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=10",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-11": {
"category": "reftest",
- "extra_args": ["--this-chunk=11"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=11",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-12": {
"category": "reftest",
- "extra_args": ["--this-chunk=12"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=12",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-13": {
"category": "reftest",
- "extra_args": ["--this-chunk=13"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=13",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-14": {
"category": "reftest",
- "extra_args": ["--this-chunk=14"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=14",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-15": {
"category": "reftest",
- "extra_args": ["--this-chunk=15"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=15",
+ "tests/layout/reftests/reftest.list"]
},
"reftest-16": {
"category": "reftest",
- "extra_args": ["--this-chunk=16"],
- },
- "reftest-17": {
- "category": "reftest",
- "extra_args": ["--this-chunk=17"],
- },
- "reftest-18": {
- "category": "reftest",
- "extra_args": ["--this-chunk=18"],
- },
- "reftest-19": {
- "category": "reftest",
- "extra_args": ["--this-chunk=19"],
- },
- "reftest-20": {
- "category": "reftest",
- "extra_args": ["--this-chunk=20"],
+ "extra_args": ["--total-chunks=16", "--this-chunk=16",
+ "tests/layout/reftests/reftest.list"]
},
"crashtest-1": {
"category": "crashtest",
"extra_args": ["--this-chunk=1"],
},
"crashtest-2": {
"category": "crashtest",
"extra_args": ["--this-chunk=2"],
},
"xpcshell-1": {
"category": "xpcshell",
- "extra_args": ["--this-chunk=1"],
+ "extra_args": ["--total-chunks=3", "--this-chunk=1"],
},
"xpcshell-2": {
"category": "xpcshell",
- "extra_args": ["--this-chunk=2"],
+ "extra_args": ["--total-chunks=3", "--this-chunk=2"],
},
"xpcshell-3": {
"category": "xpcshell",
- "extra_args": ["--this-chunk=3"],
- },
- "xpcshell-4": {
- "category": "xpcshell",
- "extra_args": ["--this-chunk=4"],
- },
- "xpcshell-5": {
- "category": "xpcshell",
- "extra_args": ["--this-chunk=5"],
- },
- "xpcshell-6": {
- "category": "xpcshell",
- "extra_args": ["--this-chunk=6"],
+ "extra_args": ["--total-chunks=3", "--this-chunk=3"],
},
"robocop-1": {
"category": "robocop",
"extra_args": ["--this-chunk=1"],
},
"robocop-2": {
"category": "robocop",
"extra_args": ["--this-chunk=2"],
@@ -313,32 +277,16 @@ config = {
"robocop-3": {
"category": "robocop",
"extra_args": ["--this-chunk=3"],
},
"robocop-4": {
"category": "robocop",
"extra_args": ["--this-chunk=4"],
},
- "robocop-5": {
- "category": "robocop",
- "extra_args": ["--this-chunk=5"],
- },
- "robocop-6": {
- "category": "robocop",
- "extra_args": ["--this-chunk=6"],
- },
- "robocop-7": {
- "category": "robocop",
- "extra_args": ["--this-chunk=7"],
- },
- "robocop-8": {
- "category": "robocop",
- "extra_args": ["--this-chunk=8"],
- },
"cppunittest": {
"category": "cppunittest",
"extra_args": [],
},
}, # end of "test_definitions"
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/android_arm_4_3_config.py",
"download_minidump_stackwalk": True,