From 34ed117ba52aeab44f6a7d42c5a142adc87fb6a0 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Sun, 17 Jul 2016 09:20:48 +0200 Subject: [PATCH] Backed out changeset 39cac65eb07c (bug 1286325) for causing merge conflicts with mozilla-central --- dom/tests/mochitest/geolocation/mochitest.ini | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dom/tests/mochitest/geolocation/mochitest.ini b/dom/tests/mochitest/geolocation/mochitest.ini index 8a7f56b3fa38..85d1574fc5ff 100644 --- a/dom/tests/mochitest/geolocation/mochitest.ini +++ b/dom/tests/mochitest/geolocation/mochitest.ini @@ -6,26 +6,48 @@ support-files = windowTest.html [test_allowCurrent.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(Bug 910235 - Error: no message manager set when calling method: [nsIObserver::observe]) b2g-debug(Bug 910235 - Error: no message manager set when calling method: [nsIObserver::observe]) b2g-desktop(Bug 910235 - Error: no message manager set when calling method: [nsIObserver::observe]) [test_allowWatch.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_cachedPosition.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_cancelCurrent.html] +skip-if = buildapp == 'b2g' [test_cancelWatch.html] +skip-if = buildapp == 'b2g' [test_clearWatch.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_clearWatchBeforeAllowing.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_clearWatch_invalid.html] +skip-if = buildapp == 'b2g' [test_errorcheck.html] +skip-if = toolkit=='gonk' || toolkit == 'android' #TIMED_OUT # b2g-debug(debug-only timeout) [test_geolocation_is_undefined_when_pref_is_off.html] [test_handlerSpinsEventLoop.html] +skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #Don't run modal tests on Android [test_manyCurrentConcurrent.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_manyCurrentSerial.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_manyWatchConcurrent.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_manyWatchSerial.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_manyWindows.html] +skip-if = buildapp == 'b2g' [test_mozsettings.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' [test_mozsettingsWatch.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' [test_optional_api_params.html] +skip-if = buildapp == 'b2g' [test_shutdown.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_timeoutCurrent.html] [test_timerRestartWatch.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_windowClose.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_worseAccuracyDoesNotBlockCallback.html] +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT