Bug 1551226 - Run Android x86_64 7.0/debug mochitests; r=snorp

We can run /debug mochitests against geckoview for the cost of another dozen
or so test annotations. Both /opt and /debug mochitests are nearly worthy of
tier 1, but still waiting for bug 1534732.

Differential Revision: https://phabricator.services.mozilla.com/D30931

--HG--
extra : moz-landing-system : lando

docshell/test/mochitest/mochitest.ini

@@ -73,6 +73,7 @@ support-files = file_bug511449.html
 [test_bug530396.html]
 support-files = bug530396-noref.sjs bug530396-subframe.html
 [test_bug540462.html]
+skip-if = toolkit == 'android' && debug && !is_fennec
 [test_bug551225.html]
 [test_bug570341.html]
 skip-if = (verify && !debug && (os == 'win'))

dom/base/test/mochitest.ini

@@ -845,5 +845,6 @@ tags = audiochannel
 [test_window_proto.html]
 [test_writable-replaceable.html]
 [test_x-frame-options.html]
+skip-if = toolkit == 'android' && debug && !is_fennec
 [test_youtube_flash_embed.html]
 # Please keep alphabetical order.

dom/html/test/mochitest.ini

@@ -575,6 +575,7 @@ support-files = file_bug871161-1.html file_bug871161-2.html
 [test_bug1013316.html]
 [test_window_open_close.html]
 tags = openwindow
+skip-if = toolkit == "android" && debug && !is_fennec
 [test_viewport_resize.html]
 [test_image_clone_load.html]
 [test_bug1203668.html]

dom/indexedDB/test/mochitest.ini

@@ -169,7 +169,9 @@ skip-if = verify
 [test_file_put_get_values.html]
 [test_file_replace.html]
 [test_file_resurrection_delete.html]
+skip-if = toolkit == 'android' && !is_fennec
 [test_file_resurrection_transaction_abort.html]
+skip-if = toolkit == 'android' && !is_fennec
 [test_file_sharing.html]
 [test_file_transaction_abort.html]
 [test_filehandle_append_read_data.html]

dom/ipc/tests/mochitest.ini

@@ -24,6 +24,6 @@ support-files =
 [test_Preallocated.html]
 skip-if = !e10s || toolkit == 'android' # Bug 1525959
 [test_force_oop_iframe.html]
-skip-if = !e10s || (os == "android" && !debug) #Bug 1545178
+skip-if = !e10s || (os == "android" && !debug) || (os == "android" && debug && !is_fennec) #Bug 1545178
 support-files =
   file_dummy.html

dom/smil/test/mochitest.ini

@@ -61,5 +61,6 @@ skip-if = toolkit == 'android' #TIMED_OUT
 [test_smilUpdatedInterval.xhtml]
 [test_smilValues.xhtml]
 [test_smilWithTransition.html]
+skip-if = toolkit == 'android' && !is_fennec
 [test_smilWithXlink.xhtml]
 [test_smilXHR.xhtml]

dom/tests/mochitest/bugs/mochitest.ini

@@ -56,6 +56,7 @@ skip-if = toolkit == 'android'
 [test_bug342448.html]
 [test_bug345521.html]
 [test_bug346659.html]
+skip-if = toolkit == 'android' && !is_fennec && debug
 [test_bug369306.html]
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug370098.html]

dom/xhr/tests/mochitest.ini

@@ -104,13 +104,14 @@ skip-if = toolkit == 'android'
 [test_xhr_send_readystate.html]
 [test_XHR_system.html]
 [test_XHR_timeout.html]
-skip-if = (android_version == '18' && debug)
+skip-if = toolkit == 'android' && debug
 support-files = test_XHR_timeout.js
 [test_xhr_withCredentials.html]
 [test_XHRDocURI.html]
 [test_XHRResponseURL.html]
 [test_XHRSendData.html]
 [test_sync_xhr_document_write_with_iframe.html]
+skip-if = toolkit == "android" && debug && !is_fennec
 [test_nestedSyncXHR.html]
 [test_event_listener_leaks.html]
 skip-if = (os == "win" && processor == "aarch64") #bug 1535784

dom/xml/test/mochitest.ini

@@ -14,4 +14,5 @@ support-files =
 [test_bug399502.xhtml]
 [test_bug445330.html]
 [test_bug691215.html]
+skip-if = toolkit == "android" && debug && !is_fennec
 [test_viewport.xhtml]

js/xpconnect/tests/mochitest/mochitest.ini

@@ -69,6 +69,7 @@ support-files =
 [test_bug691059.html]
 [test_bug720619.html]
 [test_bug731471.html]
+skip-if = toolkit == "android" && debug && !is_fennec
 [test_bug764389.html]
 [test_bug772288.html]
 [test_bug781476.html]

taskcluster/ci/test/mochitest.yml

@@ -51,7 +51,7 @@ mochitest:
     loopback-video: true
     tier:
         by-test-platform:
-            android-em-7.*/opt: 2
+            android-em-7.*: 2
             windows10-aarch64.*: 2
             default: default
     instance-size:

taskcluster/ci/test/test-sets.yml

@@ -416,7 +416,6 @@ android-x86_64-opt-tests:
     - crashtest
     # geckoview-junit perma-fail on opt and debug; bug 1521195
     # - geckoview-junit
-    - mochitest
     - web-platform-tests
     - web-platform-tests-reftests
 
@@ -425,6 +424,7 @@ android-x86_64-tests:
     - cppunit
     - jsreftest
     - marionette
+    - mochitest
     - mochitest-gpu
     # various reftest (plain) failures; bug 1501582
     # - reftest

toolkit/components/url-classifier/tests/mochitest/mochitest.ini

@@ -45,11 +45,14 @@ skip-if = (os == 'linux' && debug) #Bug 1199778
 skip-if = (verify && debug && (os == 'win' || os == 'mac'))
 [test_classify_track.html]
 [test_gethash.html]
+skip-if = toolkit == 'android' && debug && !is_fennec
 [test_bug1254766.html]
 [test_cachemiss.html]
 skip-if = verify
 [test_annotation_vs_TP.html]
 [test_fingerprinting.html]
+skip-if = toolkit == 'android' && debug && !is_fennec
 [test_fingerprinting_annotate.html]
+skip-if = toolkit == 'android' && debug && !is_fennec
 [test_cryptomining.html]
 [test_cryptomining_annotate.html]