From 59360cc742b6929ae62f4ec77ecd6cd79bdf3d16 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Fri, 21 Jul 2017 13:06:20 -0400
Subject: [PATCH] Bug 1382524 - run tp6 on talos windows (7,10) with stylo-
 talos.json changes. r=rwood

MozReview-Commit-ID: C4GsqqflkJY
---
 testing/talos/talos.json | 88 ++++------------------------------------
 1 file changed, 9 insertions(+), 79 deletions(-)

diff --git a/testing/talos/talos.json b/testing/talos/talos.json
index 40050023696c..225359a210d5 100644
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -1,72 +1,25 @@
 {
-    "talos.zip": {
-        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.a6052c33d420.zip",
-        "path": ""
-    },
-    "extra_options": {
-        "android": [ "--apkPath=%(apk_path)s" ]
-    },
     "suites": {
         "chromez-e10s": {
             "tests": ["tresize", "tcanvasmark"]
         },
-        "dromaeojs": {
-            "tests": ["dromaeo_css", "kraken"],
-            "talos_options": ["--disable-e10s"]
-        },
         "dromaeojs-e10s": {
             "tests": ["dromaeo_css", "kraken"]
         },
-        "other": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"],
-            "talos_options": ["--disable-e10s"]
-        },
         "other-e10s": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_many_windows", "sessionrestore_no_auto_restore", "tabpaint"]
         },
-        "other_nol64": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"],
-            "talos_options": ["--disable-e10s"]
-        },
-        "other-e10s_nol64": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_many_windows", "sessionrestore_no_auto_restore", "tabpaint"]
-        },
-        "other_l64": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"],
-            "talos_options": ["--disable-e10s"]
-        },
-        "other-e10s_l64": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_many_windows", "sessionrestore_no_auto_restore", "tabpaint"]
-        },
-        "g1": {
-            "tests": ["tp5o_scroll", "glterrain"],
-            "talos_options": ["--disable-e10s"],
-            "pagesets_name": "tp5n.zip"
-        },
         "g1-e10s": {
             "tests": ["tp5o_scroll", "glterrain"],
             "pagesets_name": "tp5n.zip"
         },
-        "g2": {
-            "tests": ["damp", "tps"],
-            "talos_options": ["--disable-e10s"],
-            "pagesets_name": "tp5n.zip"
-        },
         "g2-e10s": {
             "tests": ["damp", "tps"],
             "pagesets_name": "tp5n.zip"
         },
-        "g3": {
-            "tests": ["dromaeo_dom"],
-            "talos_options": ["--disable-e10s"]
-        },
         "g3-e10s": {
             "tests": ["dromaeo_dom"]
         },
-        "g4": {
-            "tests": ["basic_compositor_video", "glvideo"],
-            "talos_options": ["--disable-e10s"]
-        },
         "g4-e10s": {
             "tests": ["basic_compositor_video", "glvideo"]
         },
@@ -74,40 +27,19 @@
             "tests": ["ts_paint_webext", "tp5o_webext"],
             "pagesets_name": "tp5n.zip"
         },
-        "svgr": {
-            "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart", "tsvg_static"],
-            "talos_options": ["--disable-e10s"]
-        },
         "svgr-e10s": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart", "tsvg_static"]
         },
-        "perf-reftest": {
-            "tests": ["bloom_basic"]
-        },
         "perf-reftest-e10s": {
             "tests": ["bloom_basic"]
         },
         "perf-reftest-singletons-e10s": {
             "tests": ["bloom_basic_singleton"]
         },
-        "tp5o": {
-            "tests": ["tp5o"],
-            "pagesets_name": "tp5n.zip",
-            "talos_options": ["--disable-e10s"]
-        },
         "tp5o-e10s": {
             "tests": ["tp5o"],
             "pagesets_name": "tp5n.zip"
         },
-        "xperf": {
-            "tests": ["tp5n"],
-            "pagesets_name": "tp5n.zip",
-            "talos_options": [
-                "--disable-e10s",
-                "--xperf_path",
-                "\"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe\""
-            ]
-        },
         "xperf-e10s": {
             "tests": ["tp5n"],
             "pagesets_name": "tp5n.zip",
@@ -124,18 +56,16 @@
                 "mitmproxy-recording-google.mp mitmproxy-recording-youtube.mp mitmproxy-recording-amazon.mp mitmproxy-recording-facebook.mp",
                 "--firstNonBlankPaint"
             ]
-        }
-    },
-    "mobile-suites": {
-        "remote-tsvgx": {
-            "tests": ["tsvgm"],
-            "talos_options": [
-                "--noChrome",
-                "--tppagecycles", "7"
-            ]
         },
-        "remote-tp4m_nochrome": {
-            "tests": ["tp4m"]
+        "quantum-pageload-stylo-e10s": {
+            "tests": ["quantum_pageload_google", "quantum_pageload_youtube", "quantum_pageload_amazon", "quantum_pageload_facebook"],
+            "mitmproxy_recording_set": "mitmproxy-recording-set-win10.zip",
+            "talos_options": [
+                "--stylo",
+                "--mitmproxy",
+                "mitmproxy-recording-google.mp mitmproxy-recording-youtube.mp mitmproxy-recording-amazon.mp mitmproxy-recording-facebook.mp",
+                "--firstNonBlankPaint"
+            ]
         }
     }
 }