Bug 1278996. Move the support-files bit for test_promise_xrays.html into chrome.ini so running that one test via mach mochitest works. r=chmanchester
authorBoris Zbarsky <bzbarsky@mit.edu>
Thu, 09 Jun 2016 14:49:21 -0400
changeset 301392 57055d4a71e9d0c4e684d2c2b71e6925c46016a9
parent 301391 16150ec04e4d784612f1453c935f631c0b539b46
child 301393 e50f5587a7ef6aff4b946062a4e94f45ca9e205b
push id30333
push usercbook@mozilla.com
push dateFri, 10 Jun 2016 13:39:58 +0000
treeherdermozilla-central@52679ce4756c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1278996
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1278996. Move the support-files bit for test_promise_xrays.html into chrome.ini so running that one test via mach mochitest works. r=chmanchester
dom/promise/tests/chrome.ini
dom/promise/tests/mochitest.ini
dom/promise/tests/test_promise_xrays.html
--- a/dom/promise/tests/chrome.ini
+++ b/dom/promise/tests/chrome.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g'
 
 [test_on_new_promise.html]
 [test_on_promise_settled.html]
 [test_on_promise_settled_duplicates.html]
 [test_promise_xrays.html]
+support-files = file_promise_xrays.html
--- a/dom/promise/tests/mochitest.ini
+++ b/dom/promise/tests/mochitest.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
-# Support files for chrome tests that we want to load over HTTP need
-# to go in here, not chrome.ini, apparently.
 support-files =
-  file_promise_xrays.html
   promise_uncatchable_exception.js
 
 [test_bug883683.html]
 [test_promise.html]
 [test_promise_uncatchable_exception.html]
 skip-if = debug == false
 [test_promise_utils.html]
 [test_resolve.html]
--- a/dom/promise/tests/test_promise_xrays.html
+++ b/dom/promise/tests/test_promise_xrays.html
@@ -9,17 +9,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://global/skin"/>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1170760">Mozilla Bug 1170760</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-<iframe id="t" src="http://example.org/tests/dom/promise/tests/file_promise_xrays.html"></iframe>
+<iframe id="t" src="http://example.org/chrome/dom/promise/tests/file_promise_xrays.html"></iframe>
 </div>
 
 <pre id="test">
 <script type="application/javascript">
 
 var win = $("t").contentWindow;
 
 /** Test for Bug 1170760 **/