Bug 1310297 - Remove test annotations using b2g, mulet or gonk: extensions. r?RyanVM
MozReview-Commit-ID: H0AlYp2iIkp
--- a/extensions/cookie/test/mochitest.ini
+++ b/extensions/cookie/test/mochitest.ini
@@ -1,10 +1,9 @@
[DEFAULT]
-skip-if = buildapp == 'b2g'
support-files =
beltzner.jpg
beltzner.jpg^headers^
damonbowling.jpg
damonbowling.jpg^headers^
file_chromecommon.js
file_domain_hierarchy_inner.html
file_domain_hierarchy_inner_inner.html
--- a/extensions/cookie/test/unit/xpcshell.ini
+++ b/extensions/cookie/test/unit/xpcshell.ini
@@ -1,12 +1,12 @@
[DEFAULT]
head = head_cookies.js
tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
support-files =
cookieprompt.js
cookieprompt.manifest
[test_bug526789.js]
[test_bug650522.js]
[test_bug667087.js]
[test_cookies_async_failure.js]
--- a/extensions/cookie/test/unit_ipc/xpcshell.ini
+++ b/extensions/cookie/test/unit_ipc/xpcshell.ini
@@ -1,7 +1,7 @@
[DEFAULT]
head =
tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
[test_child.js]
[test_parent.js]
--- a/extensions/pref/autoconfig/test/unit/xpcshell.ini
+++ b/extensions/pref/autoconfig/test/unit/xpcshell.ini
@@ -1,10 +1,10 @@
[DEFAULT]
head =
tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
support-files =
autoconfig-latin1.cfg
autoconfig-utf8.cfg
autoconfig.js
[test_autoconfig_nonascii.js]
--- a/extensions/spellcheck/hunspell/tests/unit/xpcshell.ini
+++ b/extensions/spellcheck/hunspell/tests/unit/xpcshell.ini
@@ -1,7 +1,7 @@
[DEFAULT]
head =
tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
support-files = data/**
[test_hunspell.js]
--- a/extensions/spellcheck/tests/chrome/chrome.ini
+++ b/extensions/spellcheck/tests/chrome/chrome.ini
@@ -1,9 +1,9 @@
[DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
[test_add_remove_dictionaries.xul]
support-files =
base/base_utf.dic
base/base_utf.aff
map/maputf.dic
map/maputf.aff
--- a/extensions/spellcheck/tests/mochitest/mochitest.ini
+++ b/extensions/spellcheck/tests/mochitest/mochitest.ini
@@ -1,6 +1,6 @@
[DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android' || buildapp == 'mulet'
+skip-if = os == 'android'
[test_bug1170484.html]
support-files = helper_bug1170484.js
skip-if = os == 'linux' #Bug 1202570
--- a/extensions/universalchardet/tests/chrome.ini
+++ b/extensions/universalchardet/tests/chrome.ini
@@ -1,10 +1,9 @@
[DEFAULT]
-skip-if = buildapp == 'b2g'
support-files =
CharsetDetectionTests.js
bug306272_text.html
bug421271_text.html
bug426271_text-euc-jp.html
bug426271_text-utf-8.html
bug431054_text.html
bug547487_text.html