Bug 1426682 - Remove tcanvasmark from talos; r=jmaher

MozReview-Commit-ID: De1WBDevFay

testing/moz.build

@@ -33,9 +33,6 @@ with Files("talos/talos/tests/kraken/**"):
 with Files("talos/talos/tests/a11y/**"):
     BUG_COMPONENT = ("Core", "Disability Access APIs")
 
-with Files("talos/talos/tests/canvasmark/**"):
-    BUG_COMPONENT = ("Core", "Canvas: 2D")
-
 with Files("talos/talos/tests/webgl/**"):
     BUG_COMPONENT = ("Core", "Canvas: WebGL")
 

testing/talos/talos.json

@@ -1,11 +1,11 @@
 {
     "suites": {
         "chromez-e10s": {
-            "tests": ["tresize", "tcanvasmark"]
+            "tests": ["tresize"]
         },
         "chromez-stylo-disabled-e10s": {
             "talos_options": ["--disable-stylo"],
-            "tests": ["tresize", "tcanvasmark"]
+            "tests": ["tresize"]
         },
         "dromaeojs-e10s": {
             "tests": ["dromaeo_css", "kraken"]

testing/talos/talos/output.py

@@ -255,22 +255,13 @@ def speedometer_score(cls, val_list):
         score = 60 * 1000 / filter.geometric_mean(results) / correctionFactor
         return score
 
-    @classmethod
-    def CanvasMark_Metric(cls, val_list):
-        """CanvasMark benchmark score (NOTE: this is identical to JS_Metric)"""
-        results = [i for i, j in val_list]
-        LOG.info("CanvasMark benchmark")
-        return sum(results)
-
     def construct_results(self, vals, testname):
         if 'responsiveness' in testname:
             return filter.responsiveness_Metric([val for (val, page) in vals])
         elif testname.startswith('v8_7'):
             return self.v8_Metric(vals)
         elif testname.startswith('kraken'):
             return self.JS_Metric(vals)
-        elif testname.startswith('tcanvasmark'):
-            return self.CanvasMark_Metric(vals)
         elif testname.startswith('speedometer'):
             return self.speedometer_score(vals)
         elif len(vals) > 1:

testing/talos/talos/test.py

@@ -659,25 +659,6 @@ class basic_compositor_video(PageloaderTest):
     lower_is_better = True
 
 
-@register_test()
-class tcanvasmark(PageloaderTest):
-    """
-    CanvasMark benchmark v0.6
-    """
-    tpmanifest = '${talos}/tests/canvasmark/canvasmark.manifest'
-    win_counters = w7_counters = linux_counters = mac_counters = None
-    tpcycles = 5
-    tppagecycles = 1
-    timeout = 900
-    gecko_profile_interval = 10
-    gecko_profile_entries = 2500000
-    tpmozafterpaint = False
-    preferences = {'dom.send_after_paint_to_content': False}
-    filters = filter.ignore_first.prepare(1) + filter.median.prepare()
-    unit = 'score'
-    lower_is_better = False
-
-
 class dromaeo(PageloaderTest):
     """abstract base class for dramaeo tests"""
     filters = filter.dromaeo.prepare()