Bug 1083347 - Patch to remove entries in androidx86.json and annotate manifests. r=gbrown
authorVaibhav Agrawal <vaibhavmagarwal@gmail.com>
Fri, 31 Oct 2014 10:31:00 +0100
changeset 237938 667a5bff159940e4162e17b2e1a30503151852eb
parent 237937 cfed42e809713dd15271ff88cbfe5f065b933bab
child 237968 5999e92e89ffa77899c4ef65f697c1abd54c1a7c
child 237969 3b775cfbd87a512885d31519972f8e7d62821a50
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1083347
milestone36.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 1083347 - Patch to remove entries in androidx86.json and annotate manifests. r=gbrown
dom/canvas/test/mochitest.ini
dom/contacts/tests/mochitest.ini
dom/devicestorage/test/mochitest.ini
testing/mochitest/android.json
testing/mochitest/android23.json
testing/mochitest/androidx86.json
--- a/dom/canvas/test/mochitest.ini
+++ b/dom/canvas/test/mochitest.ini
@@ -64,16 +64,17 @@ skip-if = (toolkit == 'android' && proce
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 913662
 [test_2d.composite.image.destination-atop.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 913662
 [test_2d.composite.image.destination-in.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 913662
 [test_2d.composite.image.source-in.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 913662
 [test_2d.composite.image.source-out.html]
+skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 913662
 # xor and lighter aren't well handled by cairo; they mostly work, but we don't want
 # to test that
 [test_2d.composite.solid.xor.html]
 disabled =
 [test_2d.composite.solid.lighter.html]
 disabled =
 [test_2d.composite.transparent.xor.html]
 disabled =
@@ -103,17 +104,17 @@ disabled =
 [test_2d.composite.solid.luminosity.html]
 [test_2d.composite.solid.multiply.html]
 [test_2d.composite.solid.overlay.html]
 [test_2d.composite.solid.saturation.html]
 [test_2d.composite.solid.screen.html]
 [test_2d.composite.solid.soft-light.html]
 [test_2d.composite.uncovered.image.destination-atop.html]
 # This test fails in Suite on Linux for some reason, disable it there
-skip-if = os == 'linux' && buildapp == 'suite'
+skip-if = (os == 'linux' && buildapp == 'suite') || (toolkit == 'android' && processor == 'x86') #x86 only bug 913662
 [test_2d.composite.uncovered.fill.color-burn.html]
 [test_2d.composite.uncovered.fill.color-dodge.html]
 [test_2d.composite.uncovered.fill.color.html]
 [test_2d.composite.uncovered.fill.darken.html]
 [test_2d.composite.uncovered.fill.difference.html]
 [test_2d.composite.uncovered.fill.exclusion.html]
 [test_2d.composite.uncovered.fill.hard-light.html]
 [test_2d.composite.uncovered.fill.hue.html]
@@ -209,17 +210,17 @@ disabled = bug 407107
 [test_bug613794.html]
 [test_bug753758.html]
 [test_bug764125.html]
 [test_bug856472.html]
 [test_bug866575.html]
 skip-if = (toolkit == 'gonk' && debug) #bug 1045153
 [test_bug902651.html]
 [test_canvas.html]
-skip-if = (toolkit == 'gonk' && debug) #debug-only crash; bug 933541
+skip-if = (toolkit == 'gonk' && debug) || (toolkit == 'android' && processor == 'x86') #debug-only crash; bug 933541 #x86 only bug 913662
 [test_canvas_focusring.html]
 skip-if = (toolkit == 'gonk' && !debug) || (os == 'win' && debug) #specialpowers.wrap
 [test_canvas_font_setter.html]
 [test_canvas_path.html]
 [test_hitregion_canvas.html]
 [test_hitregion_event.html]
 skip-if = os == "android" || appname == "b2g"
 [test_canvas_strokeStyle_getter.html]
--- a/dom/contacts/tests/mochitest.ini
+++ b/dom/contacts/tests/mochitest.ini
@@ -5,17 +5,17 @@ support-files = shared.js
 [test_contacts_basics.html]
 skip-if = (toolkit == 'gonk' && debug) #debug-only failure
 [test_contacts_basics2.html]
 skip-if = (toolkit == 'gonk' && debug) #debug-only failure
 [test_contacts_blobs.html]
 skip-if = (toolkit == 'gonk' && debug) #debug-only failure
 [test_contacts_events.html]
 [test_contacts_getall.html]
-skip-if = (toolkit == 'gonk' && debug) #debug-only failure
+skip-if = (toolkit == 'gonk' && debug) || (toolkit == 'android' && processor == 'x86') #debug-only failure #x86 only
 [test_contacts_getall2.html]
 skip-if = (toolkit == 'gonk' && debug) #debug-only failure
 [test_contacts_international.html]
 [test_contacts_substringmatching.html]
 [test_contacts_substringmatchingVE.html]
 [test_contacts_substringmatchingCL.html]
 [test_migration.html]
   support-files =
--- a/dom/devicestorage/test/mochitest.ini
+++ b/dom/devicestorage/test/mochitest.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = e10s # bug 781789 & bug 782275
+skip-if = e10s || (toolkit == 'android' && processor == 'x86') # bug 781789 & bug 782275
 support-files = devicestorage_common.js
 
 [test_823965.html]
 # [test_add.html]
 # man, our mime database sucks hard.  followup bug # 788273
 [test_addCorrectType.html]
 [test_available.html]
 [test_basic.html]
--- a/testing/mochitest/android.json
+++ b/testing/mochitest/android.json
@@ -1,7 +1,6 @@
 {
 "runtests": {},
 "excludetests": {
-  "dom/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl",
-  "robocop": "TIMED_OUT"
+  "dom/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl"
   }
 }
--- a/testing/mochitest/android23.json
+++ b/testing/mochitest/android23.json
@@ -1,12 +1,11 @@
 {
 "runtests": {},
 "excludetests": {
-  "robocop": "TIMED_OUT",
   "dom/html/test/test_bug659743.xml": "Android 2.3 aws only; bug 1031103",
   "docshell/test/navigation/test_reserved.html": "too slow on Android 2.3 aws only; bug 1030403",
   "dom/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl",
   "dom/canvas/test/webgl-mochitest/test_no_arr_points.html": "Android 2.3 aws only; bug 1030942",
   "dom/media/tests/mochitest": "Android 2.3 only; bug 981881",
   "layout/style/test/test_media_queries.html": "Android 2.3 aws only; bug 1030419",
   "layout/style/test/test_transitions_cancel_near_end.html": "Android 2.3 aws only; bug 1030432"
   }
--- a/testing/mochitest/androidx86.json
+++ b/testing/mochitest/androidx86.json
@@ -1,32 +1,6 @@
 {
 "runtests": {},
 "excludetests": {
-  "dom/base/test/test_copypaste.xul": "bug 904183",
-  "dom/browser-element/mochitest/test_browserElement_NoWhitelist.html": "x86 only bug 936226",
-  "dom/browser-element/mochitest/test_browserElement_oop_SecurityChange.html": "TIMED_OUT, bug 766586",
-  "dom/canvas/test/test_2d.composite.image.source-out.html": "x86 only bug 913662",
-  "dom/canvas/test/test_2d.composite.uncovered.image.destination-atop.html": "x86 only bug 913662",
-  "dom/canvas/test/test_canvas.html": "x86 only bug 913662",
-  "dom/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl",
-  "dom/contacts/tests/test_contacts_getall.html": "x86 only",
-  "dom/devicestorage": "bug 781789 & bug 782275",
-  "dom/imptests/editing/conformancetest/test_runtest.html": "",
-  "dom/imptests/editing/selecttest/test_addRange.html": "bug 775227",
-  "dom/imptests/html/webgl": "WebGL",
-  "dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html": "bug 775227",
-  "dom/inputmethod": "Not supported on Android",
-  "dom/media/test/test_play_twice.html": "x86 only bug 914439",
-  "dom/media/test/test_played.html": "bug 751539",
-  "dom/media/test/test_seeked.html": "x86 only bug 914439",
-  "dom/tests/mochitest/geolocation/test_timeoutWatch.html": "TIMED_OUT",
-  "editor/libeditor/tests/test_bug569988.html": "TIMED_OUT",
-  "editor/libeditor/tests/test_texteditor_keyevent_handling.html": "",
-  "layout/generic": "CRASH_DUMP, RANDOM, ONLY IN CHUNK 10",
-  "robocop": "TIMED_OUT",
-  "toolkit/components/satchel/test/test_form_autocomplete.html": "TIMED_OUT",
-  "toolkit/components/places/tests/test_bug_411966.html": "RANDOM",
-  "toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html": "",
-  "toolkit/content/tests/widgets/test_menubar.xul": "W/SharedBufferStack(21799",
-  "toolkit/content/tests/widgets/test_contextmenu_nested.xul": ""
+  "dom/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl"
   }
 }