Merge m-c to fx-team. a=merge
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 12 Aug 2015 12:03:49 -0400
changeset 284732 b1d9f85d5354b1d985234ed7700133cca3bb6c38
parent 284731 d6108eb0d28441eb5b1828d450a4f54fb8486392 (current diff)
parent 284722 9a6b1cc80245cb5a71d89bc9abd268a5ff20d53e (diff)
child 284733 30f47ec273a90a39fce995fde23d2081babefb53
push id4331
push usermichael.l.comella@gmail.com
push dateWed, 12 Aug 2015 21:23:36 +0000
reviewersmerge
milestone43.0a1
Merge m-c to fx-team. a=merge
--- a/testing/mozharness/configs/android/androidarm_4_3.py
+++ b/testing/mozharness/configs/android/androidarm_4_3.py
@@ -302,172 +302,172 @@ config = {
         },
         "reftest-16": {
             "category": "reftest",
             "extra_args": ["--total-chunks=48", "--this-chunk=16",
                 "tests/layout/reftests/reftest.list"]
         },
         "reftest-17": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=17",
+            "extra_args": ["--total-chunks=48", "--this-chunk=17",
             "tests/layout/reftests/reftest.list"]
         },
        "reftest-18": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=18",
+            "extra_args": ["--total-chunks=48", "--this-chunk=18",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-19": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=19",
+            "extra_args": ["--total-chunks=48", "--this-chunk=19",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-20": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=20",
+            "extra_args": ["--total-chunks=48", "--this-chunk=20",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-21": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=21",
+            "extra_args": ["--total-chunks=48", "--this-chunk=21",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-22": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=22",
+            "extra_args": ["--total-chunks=48", "--this-chunk=22",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-23": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=23",
+            "extra_args": ["--total-chunks=48", "--this-chunk=23",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-24": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=24",
+            "extra_args": ["--total-chunks=48", "--this-chunk=24",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-25": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=25",
+            "extra_args": ["--total-chunks=48", "--this-chunk=25",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-26": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=26",
+            "extra_args": ["--total-chunks=48", "--this-chunk=26",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-27": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=27",
+            "extra_args": ["--total-chunks=48", "--this-chunk=27",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-28": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=28",
+            "extra_args": ["--total-chunks=48", "--this-chunk=28",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-29": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=29",
+            "extra_args": ["--total-chunks=48", "--this-chunk=29",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-30": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=30",
+            "extra_args": ["--total-chunks=48", "--this-chunk=30",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-31": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=31",
+            "extra_args": ["--total-chunks=48", "--this-chunk=31",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-32": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=32",
+            "extra_args": ["--total-chunks=48", "--this-chunk=32",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-33": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=33",
+            "extra_args": ["--total-chunks=48", "--this-chunk=33",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-34": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=34",
+            "extra_args": ["--total-chunks=48", "--this-chunk=34",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-35": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=35",
+            "extra_args": ["--total-chunks=48", "--this-chunk=35",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-36": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=36",
+            "extra_args": ["--total-chunks=48", "--this-chunk=36",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-37": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=37",
+            "extra_args": ["--total-chunks=48", "--this-chunk=37",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-38": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=38",
+            "extra_args": ["--total-chunks=48", "--this-chunk=38",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-39": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=39",
+            "extra_args": ["--total-chunks=48", "--this-chunk=39",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-40": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=40",
+            "extra_args": ["--total-chunks=48", "--this-chunk=40",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-41": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=41",
+            "extra_args": ["--total-chunks=48", "--this-chunk=41",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-42": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=42",
+            "extra_args": ["--total-chunks=48", "--this-chunk=42",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-43": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=43",
+            "extra_args": ["--total-chunks=48", "--this-chunk=43",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-44": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=44",
+            "extra_args": ["--total-chunks=48", "--this-chunk=44",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-45": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=45",
+            "extra_args": ["--total-chunks=48", "--this-chunk=45",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-46": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=46",
+            "extra_args": ["--total-chunks=48", "--this-chunk=46",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-47": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=47",
+            "extra_args": ["--total-chunks=48", "--this-chunk=47",
             "tests/layout/reftests/reftest.list"]
         },
         "reftest-48": {
             "category": "reftest",
-            "extra args": ["--total-chunks=48", "--this-chunk=48",
+            "extra_args": ["--total-chunks=48", "--this-chunk=48",
             "tests/layout/reftests/reftest.list"]
         },
         "crashtest-1": {
             "category": "crashtest",
             "extra_args": ["--this-chunk=1"],
         },
         "crashtest-2": {
             "category": "crashtest",