Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/presentation. r?RyanVM
MozReview-Commit-ID: DYwEDeD1ccf
--- a/dom/presentation/tests/mochitest/chrome.ini
+++ b/dom/presentation/tests/mochitest/chrome.ini
@@ -1,14 +1,14 @@
[DEFAULT]
support-files =
PresentationDeviceInfoChromeScript.js
PresentationSessionChromeScript.js
[test_presentation_datachannel_sessiontransport.html]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
[test_presentation_device_info.html]
[test_presentation_sender_startWithDevice.html]
skip-if = toolkit == 'android' # Bug 1129785
[test_presentation_tcp_sender.html]
skip-if = toolkit == 'android' # Bug 1129785
[test_presentation_tcp_sender_default_request.html]
skip-if = toolkit == 'android' # Bug 1129785
--- a/dom/presentation/tests/mochitest/mochitest.ini
+++ b/dom/presentation/tests/mochitest/mochitest.ini
@@ -23,54 +23,54 @@ support-files =
file_presentation_reconnect.html
file_presentation_unknown_content_type.test
file_presentation_unknown_content_type.test^headers^
test_presentation_tcp_receiver_establish_connection_unknown_content_type.js
file_presentation_mixed_security_contexts.html
[test_presentation_dc_sender.html]
[test_presentation_dc_receiver.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android') # Bug 1129785
+skip-if = (e10s || toolkit == 'android') # Bug 1129785
[test_presentation_dc_receiver_oop.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android') # Bug 1129785
+skip-if = (e10s || toolkit == 'android') # Bug 1129785
[test_presentation_1ua_sender_and_receiver_inproc.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android') # Bug 1129785
+skip-if = (e10s || toolkit == 'android') # Bug 1129785
[test_presentation_1ua_sender_and_receiver_oop.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android') # Bug 1129785
+skip-if = (e10s || toolkit == 'android') # Bug 1129785
[test_presentation_1ua_connection_wentaway_inproc.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android') # Bug 1129785
+skip-if = (e10s || toolkit == 'android') # Bug 1129785
[test_presentation_1ua_connection_wentaway_oop.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android') # Bug 1129785
+skip-if = (e10s || toolkit == 'android') # Bug 1129785
[test_presentation_device_info_permission.html]
[test_presentation_tcp_sender_disconnect.html]
skip-if = toolkit == 'android' # Bug 1129785
[test_presentation_tcp_sender_establish_connection_error.html]
skip-if = toolkit == 'android' # Bug 1129785
[test_presentation_tcp_receiver_establish_connection_error.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android' || os == 'mac' || os == 'win' || buildapp == 'mulet') # Bug 1129785, Bug 1204709
+skip-if = (e10s || toolkit == 'android' || os == 'mac' || os == 'win') # Bug 1129785, Bug 1204709
[test_presentation_tcp_receiver_establish_connection_timeout.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android') # Bug 1129785
+skip-if = (e10s || toolkit == 'android') # Bug 1129785
[test_presentation_tcp_receiver_establish_connection_unknown_content_type_inproc.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android')
+skip-if = (e10s || toolkit == 'android')
[test_presentation_tcp_receiver_establish_connection_unknown_content_type_oop.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android')
+skip-if = (e10s || toolkit == 'android')
[test_presentation_tcp_receiver.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android') # Bug 1129785
+skip-if = (e10s || toolkit == 'android') # Bug 1129785
[test_presentation_tcp_receiver_oop.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android') # Bug 1129785
+skip-if = (e10s || toolkit == 'android') # Bug 1129785
[test_presentation_receiver_auxiliary_navigation_inproc.html]
-skip-if = (e10s || toolkit == 'gonk')
+skip-if = e10s
[test_presentation_receiver_auxiliary_navigation_oop.html]
-skip-if = (e10s || toolkit == 'gonk')
+skip-if = e10s
[test_presentation_terminate_inproc.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android')
+skip-if = (e10s || toolkit == 'android')
[test_presentation_terminate_oop.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android')
+skip-if = (e10s || toolkit == 'android')
[test_presentation_terminate_establish_connection_error_inproc.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android')
+skip-if = (e10s || toolkit == 'android')
[test_presentation_terminate_establish_connection_error_oop.html]
-skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android')
+skip-if = (e10s || toolkit == 'android')
[test_presentation_sender_on_terminate_request.html]
skip-if = toolkit == 'android'
[test_presentation_sandboxed_presentation.html]
[test_presentation_reconnect.html]
[test_presentation_mixed_security_contexts.html]
[test_presentation_availability.html]