Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/xbl. r?RyanVM
MozReview-Commit-ID: EqoZrlHQFNG
--- a/dom/xbl/crashtests/crashtests.list
+++ b/dom/xbl/crashtests/crashtests.list
@@ -1,15 +1,15 @@
load 205735-1.xhtml
load 223799-1.xul
load 226744-1.xhtml
load 232095-1.xul
load 277523-1.xhtml
load 277950-1.xhtml
-skip-if(Android||B2G) load 336744-1.html # bug 1268050
+skip-if(Android) load 336744-1.html # bug 1268050
load 336960-1.html
load 342954-1.xhtml
load 342954-2.xhtml
load 368276-1.xhtml
load 368641-1.xhtml
load 378521-1.xhtml
load 382376-1.xhtml
load 382376-2.xhtml
--- a/dom/xbl/test/chrome.ini
+++ b/dom/xbl/test/chrome.ini
@@ -1,10 +1,9 @@
[DEFAULT]
-skip-if = buildapp == 'b2g'
support-files =
file_bug944407.xml
file_bug950909.xml
file_fieldScopeChain.xml
[test_bug378518.xul]
[test_bug398135.xul]
[test_bug398492.xul]
--- a/dom/xbl/test/mochitest.ini
+++ b/dom/xbl/test/mochitest.ini
@@ -13,17 +13,16 @@ support-files =
file_bug821850.xhtml
file_bug844783.xhtml
file_bug944407.html
file_bug944407.xml
file_bug946815.xhtml
file_bug950909.html
[test_bug310107.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
[test_bug366770.html]
[test_bug371724.xhtml]
[test_bug372769.html]
[test_bug378866.xhtml]
[test_bug379959.html]
[test_bug389322.xhtml]
[test_bug397934.html]
[test_bug400705.xhtml]
@@ -32,15 +31,12 @@ skip-if = (buildapp == 'b2g' && toolkit
[test_bug468210.xhtml]
[test_bug481558.html]
[test_bug526178.xhtml]
[test_bug542406.xhtml]
[test_bug591198.html]
[test_bug639338.xhtml]
[test_bug790265.xhtml]
[test_bug821850.html]
-skip-if = buildapp == 'mulet'
[test_bug844783.html]
[test_bug872273.xhtml]
-[test_bug946815.html]
-skip-if = toolkit != "gonk"
[test_bug1086996.xhtml]
[test_bug1098628_throw_from_construct.xhtml]
deleted file mode 100644
--- a/dom/xbl/test/test_bug946815.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=946815
--->
-<head>
- <meta charset="utf-8">
- <title>Test for Bug 946815</title>
- <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
- <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
- <script type="application/javascript">
-
- SimpleTest.waitForExplicitFinish();
-
- function setup() {
- // The idea of this test is to test the visibility of window.MozWifiP2pManager
- // which requires 'wifi-manage' permission on content/XBL respectively.
- // We start from no 'wifi-manage' permission, so window.MozWifiP2pManager
- // is supposed to not be seen on both content and XBL scope. Then we add
- // the permission back and we should see window.MozWifiP2pManager on content
- // and XBL scope.
- SpecialPowers.pushPermissions([{ "type": "wifi-manage", "allow": 0, "context": window.document }], function() {
- $('ifr').setAttribute('src', 'file_bug946815.xhtml');
- });
- }
-
- </script>
-</head>
-<body onload="setup();">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=946815">Mozilla Bug 946815</a>
-<p id="display"></p>
-<div id="content">
-<iframe id="ifr"></iframe>
-</div>
-<pre id="test">
-</pre>
-</body>
-</html>