Bug 1037375 - update talos to get latest bits for tp5o_scroll, glterrain, and other fixes. r=avih, a=test-only
authorJoel Maher <jmaher@mozilla.com>
Tue, 15 Jul 2014 11:33:16 -0400
changeset 207974 6d35586449b3a75dc701bcf7ef0f26214773309f
parent 207973 7025d37f4b06fd101990a93057125b897f15231a
child 207975 b9ff3addea44359e6e5eed36cb14d27fb322503f
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersavih, test-only
bugs1037375
milestone32.0a2
Bug 1037375 - update talos to get latest bits for tp5o_scroll, glterrain, and other fixes. r=avih, a=test-only
testing/talos/talos.json
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -1,16 +1,16 @@
 {
     "talos.zip": {
-        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.3a6a28b96228.zip",
+        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.b826a38ef31f.zip",
         "path": ""
     },
     "global": {
         "talos_repo": "https://hg.mozilla.org/build/talos",
-        "talos_revision": "3a6a28b96228"
+        "talos_revision": "b826a38ef31f"
     },
     "suites": {
         "chromez": {
             "tests": ["tresize", "tcanvasmark"]
         },
         "dirtypaint": {
             "tests": ["tspaint_places_generated_med", "tspaint_places_generated_max"],
             "talos_addons": [
@@ -26,17 +26,24 @@
         },
         "other_nol64": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"]
         },
         "other_l64": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "media_tests"]
         },
         "g1": {
-            "tests": ["tp5o_scroll"]
+            "tests": ["tp5o_scroll", "glterrain"],
+            "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
+            "pagesets_parent_dir_path": "talos/page_load_test/",
+            "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest",
+            "plugins": {
+                "32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
+                "64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
+            }
         },
         "svgr": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"]
         },
         "tp5o": {
             "tests": ["tp5o"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
             "pagesets_parent_dir_path": "talos/page_load_test/",