diff --git a/dom/plugins/test/mochitest/chrome.ini b/dom/plugins/test/mochitest/chrome.ini index 5a6d83786631..35a1c7ddcd33 100644 --- a/dom/plugins/test/mochitest/chrome.ini +++ b/dom/plugins/test/mochitest/chrome.ini @@ -1,5 +1,4 @@ [DEFAULT] -skip-if = (buildapp == 'b2g' || buildapp == 'mulet') support-files = hang_test.js privatemode_perwindowpb.xul diff --git a/dom/plugins/test/mochitest/mochitest.ini b/dom/plugins/test/mochitest/mochitest.ini index 6b4bccb71e31..445a8e1e5fd2 100644 --- a/dom/plugins/test/mochitest/mochitest.ini +++ b/dom/plugins/test/mochitest/mochitest.ini @@ -1,5 +1,4 @@ [DEFAULT] -skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') #b2g-desktop(tests that use plugins) subsuite = clipboard support-files = 307-xo-redirect.sjs @@ -36,7 +35,7 @@ support-files = [test_bug784131.html] [test_bug813906.html] [test_bug827160.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # needs plugin support +skip-if = toolkit == 'android' # needs plugin support [test_bug852315.html] [test_bug854082.html] [test_bug863792.html] @@ -95,7 +94,7 @@ skip-if = release_or_beta # Bug 1172627 [test_npruntime_npninvoke.html] [test_npruntime_npninvokedefault.html] [test_object.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # needs plugin support +skip-if = toolkit == 'android' # needs plugin support [test_painting.html] skip-if = (toolkit == "cocoa" && e10s) # bug 1252230 [test_plugin_scroll_invalidation.html] diff --git a/dom/plugins/test/reftest/reftest.list b/dom/plugins/test/reftest/reftest.list index ca04d4dfdd76..e2d819536770 100644 --- a/dom/plugins/test/reftest/reftest.list +++ b/dom/plugins/test/reftest/reftest.list @@ -7,7 +7,7 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) = # fuzzy because of anti-aliasing in dashed border fuzzy(16,256) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == border-padding-1.html border-padding-1-ref.html # bug 629430 fuzzy(16,256) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == border-padding-2.html border-padding-2-ref.html # bug 629430 -fuzzy(16,256) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(!haveTestPlugin) skip-if(Android||B2G) == border-padding-3.html border-padding-3-ref.html # bug 629430 # bug 773482 +fuzzy(16,256) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(!haveTestPlugin||Android) == border-padding-3.html border-padding-3-ref.html # bug 629430 # bug 773482 # The following two "pluginproblemui-direction" tests are unreliable on all platforms. They should be re-written or replaced. #random-if(cocoaWidget||d2d||/^Windows\x20NT\x205\.1/.test(http.oscpu)) fails-if(!haveTestPlugin&&!Android) == pluginproblemui-direction-1.html pluginproblemui-direction-1-ref.html # bug 567367 #random-if(cocoaWidget) fails-if(!haveTestPlugin&&!Android) == pluginproblemui-direction-2.html pluginproblemui-direction-2-ref.html diff --git a/dom/plugins/test/unit/xpcshell.ini b/dom/plugins/test/unit/xpcshell.ini index e5f2412a268f..8dae66b2083e 100644 --- a/dom/plugins/test/unit/xpcshell.ini +++ b/dom/plugins/test/unit/xpcshell.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = toolkit == 'android' || toolkit == 'gonk' +skip-if = toolkit == 'android' head = head_plugins.js tail = tags = addons