Bug 1310297 - Remove test annotations using b2g, mulet or gonk: caps. r?RyanVM draft
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 05 Nov 2016 11:29:13 +0100
changeset 434243 4b300f2ec4bc11cde450ef94dc1eb4b2d3aac66c
parent 434242 cdc2079f1399e35527d87964981e16df7e4cd6ec
child 434244 35c3dd50eb0c0f3722517f300e63ac0c95df44ec
push id34753
push userarchaeopteryx@coole-files.de
push dateSat, 05 Nov 2016 10:33:00 +0000
reviewersRyanVM
bugs1310297
milestone52.0a1
Bug 1310297 - Remove test annotations using b2g, mulet or gonk: caps. r?RyanVM MozReview-Commit-ID: DXTWNHWatEv
caps/tests/mochitest/chrome.ini
caps/tests/mochitest/mochitest.ini
--- a/caps/tests/mochitest/chrome.ini
+++ b/caps/tests/mochitest/chrome.ini
@@ -1,9 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   file_disableScript.html
   !/caps/tests/mochitest/file_disableScript.html
 
 [test_bug995943.xul]
 [test_addonMayLoad.html]
 [test_disableScript.xul]
--- a/caps/tests/mochitest/mochitest.ini
+++ b/caps/tests/mochitest/mochitest.ini
@@ -2,14 +2,12 @@
 support-files =
   file_data.txt
   file_disableScript.html
   !/js/xpconnect/tests/mochitest/file_empty.html
 
 [test_app_principal_equality.html]
 [test_bug246699.html]
 [test_bug292789.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug423375.html]
 [test_bug470804.html]
 [test_disallowInheritPrincipal.html]
 [test_extensionURL.html]
-skip-if = (buildapp == 'b2g') # nonsensical on b2g