Bug 1261158 - Convert test_xultree_animation.xhtml to a mochitest-plain. r=tnikkel a=test-only
authorKartikaya Gupta <kgupta@mozilla.com>
Mon, 04 Apr 2016 16:28:13 -0400
changeset 325701 83314b56489d1bbb02c6af26d5dc31f560b13e94
parent 325700 5f7b05487c5fd23a0164c0273291ae613a8750fb
child 325702 f5f4bbaf8f02c24f0c237991ef29e11f5835d414
push id1128
push userjlund@mozilla.com
push dateWed, 01 Jun 2016 01:31:59 +0000
treeherdermozilla-release@fe0d30de989d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstnikkel, test-only
bugs1261158
milestone47.0a2
Bug 1261158 - Convert test_xultree_animation.xhtml to a mochitest-plain. r=tnikkel a=test-only MozReview-Commit-ID: BDanrpo7ES
image/test/mochitest/chrome.ini
image/test/mochitest/mochitest.ini
image/test/mochitest/test_xultree_animation.xhtml
--- a/image/test/mochitest/chrome.ini
+++ b/image/test/mochitest/chrome.ini
@@ -1,13 +1,11 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
-  animated-gif-finalframe.gif
-  animated-gif.gif
   animationPolling.js
   iframe.html
   imgutils.js
   ref-iframe.html
   bug1132427.html
   bug1132427.gif
 
 [test_animation.html]
@@ -15,10 +13,9 @@ disabled = bug 1100497
 [test_animation2.html]
 disabled = bug 1101415
 [test_bug415761.html]
 skip-if = os != "win" || os_version == "6.2"
 support-files =
   bug415761.ico
 [test_undisplayed_iframe.html]
 disabled = bug 1060869
-[test_xultree_animation.xhtml]
 [test_bug1132427.html]
--- a/image/test/mochitest/mochitest.ini
+++ b/image/test/mochitest/mochitest.ini
@@ -141,8 +141,10 @@ skip-if = buildapp == 'b2g' || os == 'an
 [test_staticClone.html]
 skip-if = buildapp == 'b2g' || os == 'android'
 [test_svg_animatedGIF.html]
 skip-if = buildapp == 'b2g' || os == 'android'
 [test_svg_filter_animation.html]
 skip-if = buildapp == 'b2g' || os == 'android'
 [test_synchronized_animation.html]
 skip-if = buildapp == 'b2g' || os == 'android'
+[test_xultree_animation.xhtml]
+skip-if = buildapp == 'b2g' || os == 'android'
--- a/image/test/mochitest/test_xultree_animation.xhtml
+++ b/image/test/mochitest/test_xultree_animation.xhtml
@@ -3,21 +3,21 @@
 xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xml:lang="en" lang="en">
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=666446
 -->
 <head>
   <title>Test for Bug 666446 - Animated Images within SVG Filters</title>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/WindowSnapshot.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/WindowSnapshot.js"></script>
   <script type="application/javascript" src="imgutils.js"></script>
   <script type="application/javascript" src="animationPolling.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=666446">
 Mozilla Bug 666446: lots of animated gifs swamp us with paint events
 </a>
 <p id="display"></p>
 <div id="content">
   <xul:caption label="Bug 666446 - XULTree Test" />