Bug 1116187 - Disable failing mochitest-chrome tests for B2G, r=gbrown

2015-02-06 16:30:37 -08:00
parent a54b556e55
commit c4f9588ed3
86 changed files with 116 additions and 11 deletions
--- a/browser/base/content/test/chrome/chrome.ini
+++ b/browser/base/content/test/chrome/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_aboutCrashed.xul]
--- a/browser/components/feeds/test/chrome/chrome.ini
+++ b/browser/components/feeds/test/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = sample_feed.atom

 [test_423060.xul]
--- a/browser/components/places/tests/chrome/chrome.ini
+++ b/browser/components/places/tests/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = head.js

 [test_0_bug510634.xul]
--- a/browser/devtools/app-manager/test/chrome.ini
+++ b/browser/devtools/app-manager/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  hosted_app.manifest
  validator/*
--- a/browser/devtools/webide/test/chrome.ini
+++ b/browser/devtools/webide/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  app/index.html
  app/manifest.webapp
--- a/caps/tests/mochitest/chrome.ini
+++ b/caps/tests/mochitest/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  file_disableScript.html

--- a/docshell/test/chrome/chrome.ini
+++ b/docshell/test/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  662200a.html
  662200b.html
--- a/dom/animation/test/chrome.ini
+++ b/dom/animation/test/chrome.ini
@@ -1 +1,2 @@
 [chrome/test_running_on_compositor.html]
+skip-if = buildapp == 'b2g'
--- a/dom/apps/tests/chrome.ini
+++ b/dom/apps/tests/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  asmjs/*
  file_bug_945152.html
--- a/dom/base/test/chrome.ini
+++ b/dom/base/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  file_url.jsm
  file_empty.html
--- a/dom/base/test/chrome/chrome.ini
+++ b/dom/base/test/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  blockNoPlugins.xml
  blockPluginHard.xml
--- a/dom/base/test/csp/chrome.ini
+++ b/dom/base/test/csp/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_csp_bug768029.html]
 [test_csp_bug773891.html]
--- a/dom/bindings/test/chrome.ini
+++ b/dom/bindings/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_bug707564-chrome.html]
 [test_bug775543.html]
--- a/dom/canvas/test/chrome/chrome.ini
+++ b/dom/canvas/test/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = nonchrome_webgl_debug_renderer_info.html

 [test_webgl_debug_renderer_info.html]
--- a/dom/contacts/tests/chrome.ini
+++ b/dom/contacts/tests/chrome.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 skip-if = os == "android"
+skip-if = buildapp == 'b2g'

 [test_contacts_shutdown.xul]
 [test_contacts_upgrade.xul]
--- a/dom/devicestorage/test/chrome.ini
+++ b/dom/devicestorage/test/chrome.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet'
+skip-if = (buildapp == 'b2g' || buildapp == 'mulet')

 [test_app_permissions.html]
 [test_fs_app_permissions.html]
--- a/dom/encoding/test/chrome.ini
+++ b/dom/encoding/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = file_stringencoding.jsm

 [test_stringencoding.xul]
--- a/dom/events/test/chrome.ini
+++ b/dom/events/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  bug415498-doc1.html
  bug415498-doc2.html
--- a/dom/html/test/chrome.ini
+++ b/dom/html/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  file_anchor_ping.html

--- a/dom/html/test/forms/chrome.ini
+++ b/dom/html/test/forms/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  submit_invalid_file.sjs
 [test_autocompleteinfo.html]
--- a/dom/identity/tests/mochitest/chrome.ini
+++ b/dom/identity/tests/mochitest/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 support-files=
  file_browserid_rp_ok.html
--- a/dom/indexedDB/test/chrome.ini
+++ b/dom/indexedDB/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = chromeHelpers.js

 [test_globalObjects_chrome.xul]
--- a/dom/ipc/tests/chrome.ini
+++ b/dom/ipc/tests/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  process_error.xul
  process_error_contentscript.js
--- a/dom/media/test/chrome.ini
+++ b/dom/media/test/chrome.ini
@@ -1,6 +1,7 @@
 #Media chrome tests

 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  basic.vtt
  seek.webm
--- a/dom/media/webaudio/test/chrome.ini
+++ b/dom/media/webaudio/test/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_AudioNodeDevtoolsAPI.html]
--- a/dom/phonenumberutils/tests/chrome.ini
+++ b/dom/phonenumberutils/tests/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_phonenumber.xul]
 [test_phonenumberservice.xul]
--- a/dom/plugins/test/mochitest/chrome.ini
+++ b/dom/plugins/test/mochitest/chrome.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == "mulet"
+skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
 support-files =
  hang_test.js
  privatemode_perwindowpb.xul
--- a/dom/promise/tests/chrome.ini
+++ b/dom/promise/tests/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_dependentPromises.html]
 [test_on_new_promise.html]
--- a/dom/settings/tests/chrome.ini
+++ b/dom/settings/tests/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_settings_service.js]
 [test_settings_service.xul]
--- a/dom/system/tests/chrome.ini
+++ b/dom/system/tests/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = worker_constants.js

 [test_constants.xul]
--- a/dom/tests/mochitest/chrome/chrome.ini
+++ b/dom/tests/mochitest/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  489127.html
  DOMWindowCreated_chrome.xul
--- a/dom/tests/mochitest/general/chrome.ini
+++ b/dom/tests/mochitest/general/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_innerScreen.xul]
 [test_offsets.css]
--- a/dom/tests/mochitest/localstorage/chrome.ini
+++ b/dom/tests/mochitest/localstorage/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  frame_clear_browser_data.html
  page_blank.html
--- a/dom/tests/mochitest/sessionstorage/chrome.ini
+++ b/dom/tests/mochitest/sessionstorage/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_sessionStorageFromChrome.xhtml]
--- a/dom/tests/mochitest/webapps/chrome.ini
+++ b/dom/tests/mochitest/webapps/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  cross_origin.html
  head.js
--- a/dom/tests/mochitest/whatwg/chrome.ini
+++ b/dom/tests/mochitest/whatwg/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_postMessage_chrome.html]
--- a/dom/workers/test/chrome.ini
+++ b/dom/workers/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  WorkerDebuggerManager_childWorker.js
  WorkerDebuggerManager_parentWorker.js
--- a/dom/xbl/test/chrome.ini
+++ b/dom/xbl/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  file_bug944407.xml
  file_bug950909.xml
--- a/dom/xul/templates/tests/chrome/chrome.ini
+++ b/dom/xul/templates/tests/chrome/chrome.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet'
+skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
 support-files =
  animals.rdf
  animals.sqlite
--- a/dom/xul/test/chrome.ini
+++ b/dom/xul/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  398289-resource.xul
  bug497875-iframe.xul
--- a/editor/composer/test/chrome.ini
+++ b/editor/composer/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_async_UpdateCurrentDictionary.html]
 [test_bug338427.html]
--- a/editor/libeditor/tests/chrome.ini
+++ b/editor/libeditor/tests/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = green.png

 [test_bug46555.html]
--- a/extensions/cookie/test/chrome.ini
+++ b/extensions/cookie/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = channel_utils.js

 [test_app_uninstall_cookies.html]
--- a/extensions/spellcheck/tests/chrome/chrome.ini
+++ b/extensions/spellcheck/tests/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_add_remove_dictionaries.xul]
 support-files =
--- a/extensions/universalchardet/tests/chrome.ini
+++ b/extensions/universalchardet/tests/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  CharsetDetectionTests.js
  bug306272_text.html
--- a/image/test/mochitest/chrome.ini
+++ b/image/test/mochitest/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  animated-gif-finalframe.gif
  animated-gif.gif
--- a/js/xpconnect/tests/chrome/chrome.ini
+++ b/js/xpconnect/tests/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  bug503926.xul
  file_bug618176.xul
--- a/layout/base/tests/chrome/chrome.ini
+++ b/layout/base/tests/chrome/chrome.ini
@@ -22,39 +22,63 @@ support-files =
 [test_bug396367-1.html]
 [test_bug396367-2.html]
 [test_bug420499.xul]
+skip-if = buildapp == 'b2g'
 [test_bug458898.html]
+skip-if = buildapp == 'b2g'
 [test_bug495648.xul]
+skip-if = buildapp == 'b2g'
 [test_bug504311.xul]
+skip-if = buildapp == 'b2g'
 [test_bug514660.xul]
+skip-if = buildapp == 'b2g'
 [test_bug533845.xul]
-skip-if = buildapp == 'mulet'
+skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 [test_bug551434.html]
 [test_bug708062.html]
 [test_bug812817.xul]
+skip-if = buildapp == 'b2g'
 [test_bug847890_paintFlashing.html]
 [test_bug1018265.xul]
-skip-if = buildapp == 'mulet'
+skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 [test_bug1041200.xul]
+skip-if = buildapp == 'b2g'
 support-files=bug1041200_window.html
 [test_chrome_content_integration.xul]
+skip-if = buildapp == 'b2g'
 [test_chrome_over_plugin.xul]
-skip-if = buildapp == 'mulet'
+skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 [test_default_background.xul]
+skip-if = buildapp == 'b2g'
 [test_dialog_with_positioning.html]
+skip-if = buildapp == 'b2g'
 [test_fixed_bg_scrolling_repaints.html]
+skip-if = buildapp == 'b2g'
 [test_leaf_layers_partition_browser_window.xul]
-skip-if = (!debug) || (toolkit == "cocoa") # Disabled on Mac because of Bug 748219
+skip-if = (!debug) || (toolkit == "cocoa") || (buildapp == 'b2g') # Disabled on Mac because of Bug 748219
 [test_no_clip_iframe.xul]
+skip-if = buildapp == 'b2g'
 [test_passpointerevents.html]
+skip-if = buildapp == 'b2g'
 [test_passpointerevents_dynamic.html]
+skip-if = buildapp == 'b2g'
 [test_prerendered_transforms.html]
+skip-if = buildapp == 'b2g'
 [test_printpreview.xul]
+skip-if = buildapp == 'b2g'
 [test_printpreview_bug396024.xul]
+skip-if = buildapp == 'b2g'
 [test_printpreview_bug482976.xul]
+skip-if = buildapp == 'b2g'
 [test_scroll_selection_into_view.html]
+skip-if = buildapp == 'b2g'
 support-files=scroll_selection_into_view_window.html
 [test_scrolling_repaints.html]
+skip-if = buildapp == 'b2g'
 [test_transformed_scrolling_repaints.html]
+skip-if = buildapp == 'b2g'
 [test_transformed_scrolling_repaints_2.html]
+skip-if = buildapp == 'b2g'
 [test_transformed_scrolling_repaints_3.html]
+skip-if = buildapp == 'b2g'
 [test_will_change.html]
+skip-if = buildapp == 'b2g'
--- a/layout/forms/test/chrome.ini
+++ b/layout/forms/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  bug536567_iframe.html
  bug536567_subframe.html
--- a/layout/generic/test/chrome.ini
+++ b/layout/generic/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  file_bug514732_window.xul
  frame_selection_underline-ref.xhtml
--- a/layout/inspector/tests/chrome/chrome.ini
+++ b/layout/inspector/tests/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = GentiumPlus-R.woff

 [test_bug467669.css]
--- a/layout/style/test/chrome/chrome.ini
+++ b/layout/style/test/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  bug535806-css.css
  bug535806-html.html
--- a/layout/xul/test/chrome.ini
+++ b/layout/xul/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  window_resizer.xul
  window_resizer_element.xul
--- a/modules/libjar/test/chrome/chrome.ini
+++ b/modules/libjar/test/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  signed-added.zip
  signed-badca.zip
--- a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/chrome.ini
+++ b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_chrome.js]
--- a/security/manager/ssl/tests/mochitest/bugs/chrome.ini
+++ b/security/manager/ssl/tests/mochitest/bugs/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_bug234856.html]
 [test_bug413909.html]
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = page_blank.html

 [test_sts_privatebrowsing_perwindowpb.html]
--- a/services/fxaccounts/tests/mochitest/chrome.ini
+++ b/services/fxaccounts/tests/mochitest/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files=
  file_invalidEmailCase.sjs

--- a/testing/mochitest/chrome/chrome.ini
+++ b/testing/mochitest/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = test-dir/test-file

 [test_sample.xul]
--- a/toolkit/components/aboutmemory/tests/chrome.ini
+++ b/toolkit/components/aboutmemory/tests/chrome.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet'
+skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
 support-files =
  crash-dump-diff1.json
  crash-dump-diff2.json
--- a/toolkit/components/console/tests/chrome.ini
+++ b/toolkit/components/console/tests/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_hugeURIs.xul]
--- a/toolkit/components/ctypes/tests/chrome/chrome.ini
+++ b/toolkit/components/ctypes/tests/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  xpcshellTestHarnessAdaptor.js
  ctypes_worker.js
--- a/toolkit/components/feeds/test/chrome.ini
+++ b/toolkit/components/feeds/test/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_bug675492.xul]
--- a/toolkit/components/formautofill/test/chrome/chrome.ini
+++ b/toolkit/components/formautofill/test/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 # The following files starting with ".." are installed in the current folder.
 support-files =
  ../head_common.js
--- a/toolkit/components/osfile/tests/mochi/chrome.ini
+++ b/toolkit/components/osfile/tests/mochi/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  main_test_osfile_async.js
  worker_handler.js
--- a/toolkit/components/passwordmgr/test/chrome.ini
+++ b/toolkit/components/passwordmgr/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  formsubmit.sjs
  notification_common.js
--- a/toolkit/components/perf/chrome.ini
+++ b/toolkit/components/perf/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_pm.xul]
--- a/toolkit/components/places/tests/chrome/chrome.ini
+++ b/toolkit/components/places/tests/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = history_post.sjs

 [test_303567.xul]
--- a/toolkit/components/url-classifier/tests/mochitest/chrome.ini
+++ b/toolkit/components/url-classifier/tests/mochitest/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  allowlistAnnotatedFrame.html
  classifiedAnnotatedFrame.html
--- a/toolkit/components/viewsource/test/chrome.ini
+++ b/toolkit/components/viewsource/test/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_428653.xul]
--- a/toolkit/components/workerloader/tests/chrome.ini
+++ b/toolkit/components/workerloader/tests/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  moduleA-depends.js
  moduleB-dependency.js
--- a/toolkit/components/xulstore/tests/chrome/chrome.ini
+++ b/toolkit/components/xulstore/tests/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  window_persistence.xul
  animals.rdf
--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  ../widgets/popup_shared.js
  ../widgets/tree_shared.js
--- a/toolkit/content/tests/widgets/chrome.ini
+++ b/toolkit/content/tests/widgets/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  tree_shared.js
  popup_shared.js
--- a/toolkit/devtools/server/tests/mochitest/chrome.ini
+++ b/toolkit/devtools/server/tests/mochitest/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  director-helpers.js
  inspector-helpers.js
--- a/toolkit/devtools/tests/mochitest/chrome.ini
+++ b/toolkit/devtools/tests/mochitest/chrome.ini
@@ -1,3 +1,6 @@
+[DEFAULT]
+skip-if = buildapp == 'b2g'
+
 [test_eventemitter_basic.html]
 [test_devtools_extensions.html]
-[test_loader_paths.html]
+[test_loader_paths.html]
--- a/toolkit/devtools/webconsole/test/chrome.ini
+++ b/toolkit/devtools/webconsole/test/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  common.js
  data.json
--- a/toolkit/identity/tests/chrome/chrome.ini
+++ b/toolkit/identity/tests/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  sandbox_content.html
  sandbox_content.sjs
--- a/toolkit/modules/tests/chrome/chrome.ini
+++ b/toolkit/modules/tests/chrome/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_bug544442_checkCert.xul]
--- a/toolkit/mozapps/downloads/tests/chrome/chrome.ini
+++ b/toolkit/mozapps/downloads/tests/chrome/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  unknownContentType_dialog_layout_data.pif
  unknownContentType_dialog_layout_data.pif^headers^
--- a/toolkit/mozapps/update/tests/chrome/chrome.ini
+++ b/toolkit/mozapps/update/tests/chrome/chrome.ini
@@ -3,7 +3,7 @@
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.

 [DEFAULT]
-skip-if = buildapp == 'mulet'
+skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
 support-files =
  utils.js
  update.sjs
--- a/toolkit/profile/test/chrome.ini
+++ b/toolkit/profile/test/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_create_profile.xul]
--- a/toolkit/themes/osx/mochitests/chrome.ini
+++ b/toolkit/themes/osx/mochitests/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_bug510426.xul]
--- a/toolkit/webapps/tests/chrome.ini
+++ b/toolkit/webapps/tests/chrome.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || os == "mac" && os_version == "10.6" # see bug 993690
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || os == "mac" && os_version == "10.6" # see bug 993690
 support-files =
  head.js
  app.sjs
--- a/widget/tests/chrome.ini
+++ b/widget/tests/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
  empty_window.xul
  utils.js
--- a/xpfe/appshell/test/chrome.ini
+++ b/xpfe/appshell/test/chrome.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'

 [test_hiddenPrivateWindow.xul]