From 5170c04fa0488ed00af6b7aa4601a89f47ecf508 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 20 Mar 2015 00:45:00 +0100 Subject: [PATCH] Bug 1144080 - Disable mochitests on Mulet for TaskCluster. r=ahal --- dom/base/test/mochitest.ini | 2 +- dom/html/test/mochitest.ini | 3 +++ dom/indexedDB/test/mochitest.ini | 2 +- dom/ipc/tests/mochitest.ini | 2 +- dom/media/tests/mochitest/mochitest.ini | 2 +- layout/generic/test/mochitest.ini | 5 ++++- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini index 8fb1707ea13..79aea373a8f 100644 --- a/dom/base/test/mochitest.ini +++ b/dom/base/test/mochitest.ini @@ -734,7 +734,7 @@ skip-if = toolkit == 'android' || e10s #RANDOM [test_w3element_traversal.xhtml] [test_w3element_traversal_svg.html] [test_websocket.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s +skip-if = buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'android' || e10s # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. [test_websocket_basic.html] skip-if = buildapp == 'b2g' || toolkit == 'android' [test_websocket_hello.html] diff --git a/dom/html/test/mochitest.ini b/dom/html/test/mochitest.ini index 526505f6ccc..2aaaeea83c0 100644 --- a/dom/html/test/mochitest.ini +++ b/dom/html/test/mochitest.ini @@ -194,6 +194,7 @@ support-files = [test_anchor_href_cache_invalidation.html] [test_applet_attributes_reflection.html] [test_audio_wakelock.html] +skip-if = buildapp == 'mulet' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. [test_base_attributes_reflection.html] [test_bug100533.html] [test_bug109445.html] @@ -341,8 +342,10 @@ skip-if = (toolkit == 'gonk' && debug) || e10s #debug-only failure [test_bug601030.html] [test_bug605124-1.html] [test_bug605124-2.html] +skip-if = buildapp == 'mulet' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. [test_bug605125-1.html] [test_bug605125-2.html] +skip-if = buildapp == 'mulet' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. [test_bug606817.html] [test_bug607145.html] [test_bug610212.html] diff --git a/dom/indexedDB/test/mochitest.ini b/dom/indexedDB/test/mochitest.ini index 9703ec3c92a..7884581a87c 100644 --- a/dom/indexedDB/test/mochitest.ini +++ b/dom/indexedDB/test/mochitest.ini @@ -322,7 +322,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116 [test_remove_index.html] skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116 [test_remove_objectStore.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116 +skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || (buildapp == 'mulet') # Bug 931116 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. [test_request_readyState.html] skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116 [test_setVersion.html] diff --git a/dom/ipc/tests/mochitest.ini b/dom/ipc/tests/mochitest.ini index b0590709c7e..ffa4de1b05c 100644 --- a/dom/ipc/tests/mochitest.ini +++ b/dom/ipc/tests/mochitest.ini @@ -13,4 +13,4 @@ skip-if = toolkit != 'gonk' [test_child_docshell.html] skip-if = toolkit == 'cocoa' # disabled due to hangs, see changeset 6852e7c47edf [test_CrashService_crash.html] -skip-if = !(crashreporter && !e10s && (toolkit == 'gtk2' || toolkit == 'gtk3' || toolkit == 'cocoa' || toolkit == 'windows') && (buildapp != 'b2g' || toolkit == 'gonk')) +skip-if = !(crashreporter && !e10s && (toolkit == 'gtk2' || toolkit == 'gtk3' || toolkit == 'cocoa' || toolkit == 'windows') && (buildapp != 'b2g' || toolkit == 'gonk') && (buildapp != 'mulet')) # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini index a68723334ef..5c67c81c759 100644 --- a/dom/media/tests/mochitest/mochitest.ini +++ b/dom/media/tests/mochitest/mochitest.ini @@ -42,7 +42,7 @@ skip-if = (toolkit == 'gonk' && debug) # debug-only failure, turned an intermitt [test_getUserMedia_constraints.html] skip-if = toolkit == 'gonk' || toolkit == 'android' # Bug 1063290, intermittent timeout [test_getUserMedia_callbacks.html] -skip-if = toolkit == 'gonk' || toolkit == 'android' # Bug 1063290, intermittent timeout +skip-if = toolkit == 'gonk' || toolkit == 'android' || buildapp == 'mulet' # Bug 1063290, intermittent timeout # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. [test_getUserMedia_gumWithinGum.html] skip-if = toolkit == 'gonk' || toolkit == 'android' # Bug 1063290, intermittent timeout [test_getUserMedia_playAudioTwice.html] diff --git a/layout/generic/test/mochitest.ini b/layout/generic/test/mochitest.ini index 1c5830ea312..126ec362582 100644 --- a/layout/generic/test/mochitest.ini +++ b/layout/generic/test/mochitest.ini @@ -56,7 +56,7 @@ support-files = file_bug449653_1.html file_bug449653_1_ref.html [test_bug488417.html] skip-if = true # Bug 489560 [test_bug496275.html] -skip-if = toolkit == 'android' #CRASH_DUMP +skip-if = toolkit == 'android' || buildapp == 'mulet' #CRASH_DUMP # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. [test_bug503813.html] skip-if = buildapp == 'mulet' || toolkit == 'android' #CRASH_DUMP [test_bug507902.html] @@ -72,9 +72,12 @@ support-files = file_bug579767_1.html file_bug579767_2.html [test_bug589621.html] [test_bug589623.html] [test_bug597333.html] +skip-if = buildapp == 'mulet' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. [test_bug633762.html] +skip-if = buildapp == 'mulet' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. support-files = bug633762_iframe.html [test_bug666225.html] +skip-if = buildapp == 'mulet' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. [test_bug719503.html] [test_bug719515.html] [test_bug719518.html]