Bug 1310297 - Remove test annotations using b2g, mulet or gonk: caps. r=RyanVM
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 05 Nov 2016 11:29:13 +0100
changeset 321133 c190459f9e039530e80a3d52eb98265addcb88ac
parent 321132 7ef66a5e57ace4c2066ab92186269638e2e8801a
child 321134 2b55ec912ac52be3267251577590117fd6283128
push id30919
push userphilringnalda@gmail.com
push dateSat, 05 Nov 2016 20:28:20 +0000
treeherdermozilla-central@572249b2ffb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1310297
milestone52.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 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