Bug 1263474. Convert three tests image/test/mochitest/chrome.ini to mochitest-plain. r=kats a=tests-only
authorTimothy Nikkel <tnikkel@gmail.com>
Mon, 11 Apr 2016 20:52:40 -0500
changeset 323900 3312754269d285ad416da1d54cf07e6a163ce479
parent 323899 4fcb50c0a4df11e45aef58bf0787a0889dc8b5be
child 323901 71affd40d13fbb376bba363562cbf65524e11f0a
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats, tests-only
bugs1263474
milestone47.0a2
Bug 1263474. Convert three tests image/test/mochitest/chrome.ini to mochitest-plain. r=kats a=tests-only
image/test/mochitest/chrome.ini
image/test/mochitest/mochitest.ini
image/test/mochitest/test_animation.html
image/test/mochitest/test_animation2.html
image/test/mochitest/test_undisplayed_iframe.html
--- a/image/test/mochitest/chrome.ini
+++ b/image/test/mochitest/chrome.ini
@@ -1,16 +1,7 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g' || os == 'android'
-support-files =
-  animationPolling.js
-  animated-gif.gif
-  iframe.html
-  imgutils.js
-  ref-iframe.html
 
-[test_animation.html]
-[test_animation2.html]
 [test_bug415761.html]
 skip-if = os != "win" || os_version == "6.2"
 support-files =
   bug415761.ico
-[test_undisplayed_iframe.html]
--- a/image/test/mochitest/mochitest.ini
+++ b/image/test/mochitest/mochitest.ini
@@ -49,27 +49,29 @@ support-files =
   filter-final.svg
   filter.svg
   first-frame-padding.gif
   green.png
   green-background.html
   grey.png
   ico-bmp-opaque.ico
   ico-bmp-transparent.ico
+  iframe.html
   imgutils.js
   invalid.jpg
   keep.gif
   keep.png
   lime100x100.svg
   lime-anim-100x100.svg
   lime-anim-100x100-2.svg
   opaque.bmp
   purple.gif
   red.gif
   red.png
+  ref-iframe.html
   restore-previous.gif
   restore-previous.png
   rillybad.jpg
   schrep.png
   shaver.png
   short_header.gif
   source.png
   transparent.gif
@@ -106,16 +108,20 @@ skip-if = (toolkit == 'android' && proce
 [test_bug767779.html]
 [test_bug865919.html]
 [test_bug89419-1.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only
 [test_bug89419-2.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only
 [test_bug1180105.html]
 [test_bug1217571.html]
+[test_animation.html]
+skip-if = buildapp == 'b2g' || os == 'android'
+[test_animation2.html]
+skip-if = buildapp == 'b2g' || os == 'android'
 [test_animation_operators.html]
 [test_drawDiscardedImage.html]
 skip-if = toolkit == "gonk" #Bug 997034 - canvas.toDataURL() often causes lost connection to device.
 [test_error_events.html]
 [test_short_gif_header.html]
 [test_image_buffer_limit.html]
 #skip-if = toolkit != "gonk" #Image buffer limit is only set for Firefox OS currently.
 disabled = bug 1060869
@@ -143,12 +149,14 @@ 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_undisplayed_iframe.html]
+skip-if = buildapp == 'b2g' || os == 'android'
 [test_xultree_animation.xhtml]
 skip-if = buildapp == 'b2g' || os == 'android'
 [test_bug1132427.html]
 skip-if = buildapp == 'b2g' || os == 'android'
--- a/image/test/mochitest/test_animation.html
+++ b/image/test/mochitest/test_animation.html
@@ -1,21 +1,20 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=666446
 -->
 <head>
   <title>Test for Bug 666446 - General Animated GIF Test</title>
-  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
-  <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">
--- a/image/test/mochitest/test_animation2.html
+++ b/image/test/mochitest/test_animation2.html
@@ -1,21 +1,20 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=705580
 -->
 <head>
   <title>Test for Bug 705580 - General Animated GIF Test 2</title>
-  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
-  <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=705580">
 Mozilla Bug 705580: Test animated GIFs that are converted to ImageLayers
 </a>
 <p id="display"></p>
 
 <div id="content">
--- a/image/test/mochitest/test_undisplayed_iframe.html
+++ b/image/test/mochitest/test_undisplayed_iframe.html
@@ -1,21 +1,20 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=666446
 -->
 <head>
 <title>Test for Bug 666446 - Test for Animated Gif within IFRAME</title>
-<script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
-<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">
     <div id="referenceDiv" style="display:none;">