Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/encoding. r=RyanVM
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 05 Nov 2016 11:29:15 +0100
changeset 347842 3a97d4394764a8d9ef00cdb82e2d88e6170074fe
parent 347841 05a67089ffd29615a457bde285b4bc1aef4e6e3f
child 347843 f462dcc8b14ddc5bd8cd9e20c5b729d8411e8c49
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1310297
milestone52.0a1
Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/encoding. r=RyanVM MozReview-Commit-ID: FWZMOt0nTrP
dom/encoding/test/chrome.ini
dom/encoding/test/mochitest.ini
dom/encoding/test/unit/xpcshell.ini
--- a/dom/encoding/test/chrome.ini
+++ b/dom/encoding/test/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = file_stringencoding.jsm
 
 [test_stringencoding.xul]
--- a/dom/encoding/test/mochitest.ini
+++ b/dom/encoding/test/mochitest.ini
@@ -1,28 +1,27 @@
 [DEFAULT]
 support-files =
+  file_TLD.html
   file_utf16_be_bom.css
   file_utf16_be_bom.js
   file_utf16_be_bom.xhtml
   file_utf16_le_bom.css
   file_utf16_le_bom.js
   file_utf16_le_bom.xhtml
   file_utf16_le_nobom.xhtml
-  file_TLD.html
+  test_BOMEncoding.js
+  test_TextDecoder.js
+  test_TextEncoder.js
   unit/test_big5.js
   unit/test_euc-jp.js
   unit/test_euc-kr.js
   unit/test_gbk.js
   unit/test_iso-2022-jp.js
   unit/test_shift_jis.js
   worker_helper.js
-  test_BOMEncoding.js
-  test_TextDecoder.js
-  test_TextEncoder.js
 
+[test_stringencoding.html]
+[test_submit_euckr.html]
 [test_TextDecoder.html]
 [test_TextEncoder.html]
-[test_stringencoding.html]
-skip-if = buildapp == 'b2g' # b2g(Test timed out on b2g board) b2g-debug(Test timed out on b2g board) b2g-desktop(Test timed out on b2g board)
-[test_submit_euckr.html]
 [test_TLD.html]
 [test_utf16_files.html]
--- a/dom/encoding/test/unit/xpcshell.ini
+++ b/dom/encoding/test/unit/xpcshell.ini
@@ -1,14 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
-skip-if = toolkit == 'gonk'
-
-[test_misc.js]
-[test_utf.js]
 
 [test_big5.js]
 [test_euc-jp.js]
 [test_euc-kr.js]
 [test_gbk.js]
 [test_iso-2022-jp.js]
+[test_misc.js]
 [test_shift_jis.js]
+[test_utf.js]