diff -r 000000000000 -r 6474c204b198 dom/tests/mochitest/geolocation/mochitest.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/tests/mochitest/geolocation/mochitest.ini	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,50 @@
+[DEFAULT]
+support-files =
+  geolocation.html
+  geolocation_common.js
+  network_geolocation.sjs
+  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' || e10s #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_clearWatch_invalid.html]
+skip-if = buildapp == 'b2g'
+[test_errorcheck.html]
+skip-if = toolkit=='gonk' || toolkit == 'android' || e10s #TIMED_OUT # b2g-debug(debug-only timeout)
+[test_geolocation_is_undefined_when_pref_is_off.html]
+[test_handlerSpinsEventLoop.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #Don't run modal tests on Android # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
+[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' || e10s #mozSettings is undefined
+[test_mozsettingsWatch.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #mozSettings is undefined
+[test_optional_api_params.html]
+skip-if = buildapp == 'b2g'
+[test_shutdown.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
+[test_timerRestartWatch.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT
+[test_windowClose.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
+[test_worseAccuracyDoesNotBlockCallback.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT