Bug 1310297 - Remove test annotations using b2g, mulet or gonk: modules. r?RyanVM
MozReview-Commit-ID: 2tN5AOxZVvU
--- a/modules/libjar/test/chrome/chrome.ini
+++ b/modules/libjar/test/chrome/chrome.ini
@@ -1,10 +1,9 @@
[DEFAULT]
-skip-if = buildapp == 'b2g'
support-files =
signed-added.zip
signed-badca.zip
signed-tampered.zip
signed.zip
unsigned.zip
[test_bug386153.html]
--- a/modules/libjar/test/mochitest/mochitest.ini
+++ b/modules/libjar/test/mochitest/mochitest.ini
@@ -1,10 +1,9 @@
[DEFAULT]
-skip-if = buildapp == 'b2g'
support-files =
bug403331.zip
bug403331.zip^headers^
openredirect.sjs
!/dom/base/test/file_bug945152.jar
[test_bug403331.html]
[test_bug1034143_mapped.html]
--- a/modules/libjar/test/unit/xpcshell.ini
+++ b/modules/libjar/test/unit/xpcshell.ini
@@ -1,12 +1,12 @@
[DEFAULT]
head =
tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
support-files =
data/empty
data/test_bug333423.zip
data/test_bug336691.zip
data/test_bug370103.jar
data/test_bug379841.zip
data/test_bug589292.zip
data/test_bug597702.zip
--- a/modules/libjar/zipwriter/test/unit/xpcshell.ini
+++ b/modules/libjar/zipwriter/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
[DEFAULT]
head = head_zipwriter.js
tail = tail_zipwriter.js
-skip-if = toolkit == 'gonk'
support-files =
data/test_bug446708/thumbs/st14-1.tiff
data/emptyfile.txt
data/smallfile.txt
data/test.png
data/test.txt
data/test.zip
data/test_bug399727.html
--- a/modules/libmar/tests/unit/xpcshell.ini
+++ b/modules/libmar/tests/unit/xpcshell.ini
@@ -1,9 +1,8 @@
[DEFAULT]
head = head_libmar.js
tail =
-skip-if = toolkit == 'gonk'
support-files = data/**
[test_create.js]
[test_extract.js]
[test_sign_verify.js]
--- a/modules/libpref/test/unit/xpcshell.ini
+++ b/modules/libpref/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
[DEFAULT]
head = head_libPrefs.js
tail =
-skip-if = toolkit == 'gonk'
support-files =
data/testPref.js
extdata/testExt.js
[test_warnings.js]
[test_bug345529.js]
[test_bug506224.js]
[test_bug577950.js]
--- a/modules/libpref/test/unit_ipc/xpcshell.ini
+++ b/modules/libpref/test/unit_ipc/xpcshell.ini
@@ -1,11 +1,11 @@
[DEFAULT]
head =
tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
[test_existing_prefs.js]
[test_initial_prefs.js]
[test_large_pref.js]
[test_observed_prefs.js]
[test_update_prefs.js]
[test_user_default_prefs.js]