Bug 975455 - Move more Mochitests to manifests. r=jmaher
authorTed Mielczarek <ted@mielczarek.org>
Thu, 20 Feb 2014 10:14:52 -0500
changeset 170797 c3b332620bb61c4d30eb53175e5149c5ac02cddb
parent 170796 a34e6d5519efea358caaf9daf8555b04443539eb
child 170798 395177ab859b8358fdec0d67626c8c1e6e7eae06
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersjmaher
bugs975455
milestone30.0a1
Bug 975455 - Move more Mochitests to manifests. r=jmaher
accessible/tests/mochitest/Makefile.in
accessible/tests/mochitest/a11y.ini
dom/browser-element/mochitest/Makefile.in
dom/browser-element/mochitest/mochitest-oop.ini
dom/browser-element/mochitest/mochitest.ini
dom/browser-element/mochitest/moz.build
dom/browser-element/moz.build
dom/devicestorage/ipc/Makefile.in
dom/devicestorage/ipc/moz.build
dom/devicestorage/moz.build
dom/devicestorage/test/moz.build
layout/generic/moz.build
layout/generic/test/Makefile.in
layout/generic/test/mochitest.ini
layout/generic/test/moz.build
layout/moz.build
layout/reftests/fonts/Makefile.in
layout/reftests/fonts/mochitest.ini
layout/reftests/fonts/moz.build
layout/reftests/fonts/mplus/Makefile.in
layout/reftests/fonts/mplus/mochitest.ini
layout/reftests/fonts/mplus/moz.build
layout/style/test/Makefile.in
layout/style/test/css-visited/mochitest.ini
layout/style/test/mochitest.ini
layout/style/test/moz.build
toolkit/components/satchel/moz.build
toolkit/components/satchel/test/browser/Makefile.in
toolkit/components/satchel/test/browser/moz.build
toolkit/content/tests/chrome/Makefile.in
toolkit/content/tests/chrome/chrome.ini
toolkit/content/tests/chrome/moz.build
toolkit/content/tests/moz.build
toolkit/content/tests/widgets/Makefile.in
toolkit/content/tests/widgets/mochitest.ini
toolkit/content/tests/widgets/moz.build
deleted file mode 100644
--- a/accessible/tests/mochitest/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_A11Y_FILES += \
-  $(topsrcdir)/content/media/test/bug461281.ogg \
-  $(NULL)
--- a/accessible/tests/mochitest/a11y.ini
+++ b/accessible/tests/mochitest/a11y.ini
@@ -1,10 +1,11 @@
 [DEFAULT]
 support-files =
+  ../../../content/media/test/bug461281.ogg
   dumbfile.xpi
   formimage.png
   letters.gif
   moz.png
   longdesc_src.html
   actions.js
   attributes.js
   autocomplete.js
deleted file mode 100644
--- a/dom/browser-element/mochitest/Makefile.in
+++ /dev/null
@@ -1,271 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Note: browserElementTestHelpers.js looks at the test's filename to determine
-# whether the test should be OOP.  "_oop_" signals OOP, "_inproc_" signals in
-# process.  Default is OOP.
-
-MOCHITEST_FILES = \
-                $(topsrcdir)/browser/base/content/test/general/audio.ogg \
-                $(topsrcdir)/content/media/test/short-video.ogv \
-		file_empty_script.js \
-		file_empty.html \
-		file_focus.html \
-		browserElementTestHelpers.js \
-		test_browserElement_NoAttr.html \
-		test_browserElement_NoPref.html \
-		test_browserElement_NoWhitelist.html \
-		browserElement_LoadEvents.js \
-		file_browserElement_LoadEvents.html \
-		test_browserElement_inproc_LoadEvents.html \
-		browserElement_DataURI.js \
-		test_browserElement_inproc_DataURI.html \
-		browserElement_ErrorSecurity.js \
-		browserElement_Titlechange.js \
-		test_browserElement_inproc_Titlechange.html \
-		browserElement_TopBarrier.js \
-		test_browserElement_inproc_TopBarrier.html \
-		browserElement_AppWindowNamespace.js \
-		test_browserElement_inproc_AppWindowNamespace.html \
-		file_browserElement_AppWindowNamespace.html \
-		browserElement_BrowserWindowNamespace.js \
-		test_browserElement_inproc_BrowserWindowNamespace.html \
-		file_browserElement_BrowserWindowNamespace.html \
-		browserElement_Iconchange.js \
-		browserElement_Metachange.js \
-		file_browserElement_Metachange.sjs \
-		browserElement_Opensearch.js \
-		test_browserElement_inproc_Iconchange.html \
-		test_browserElement_inproc_Metachange.html \
-		test_browserElement_inproc_Opensearch.html \
-		browserElement_GetScreenshot.js \
-		browserElement_GetScreenshotDppx.js \
-		test_browserElement_inproc_GetScreenshot.html \
-		test_browserElement_inproc_GetScreenshotDppx.html \
-		browserElement_BadScreenshot.js \
-		test_browserElement_inproc_BadScreenshot.html \
-		browserElement_SetVisible.js \
-		test_browserElement_inproc_SetVisible.html \
-		browserElement_SetVisibleFrames.js \
-		test_browserElement_inproc_SetVisibleFrames.html \
-		file_browserElement_SetVisibleFrames_Outer.html \
-		file_browserElement_SetVisibleFrames_Inner.html \
-		browserElement_SetVisibleFrames2.js \
-		test_browserElement_inproc_SetVisibleFrames2.html \
-		file_browserElement_SetVisibleFrames2_Outer.html \
-		browserElement_KeyEvents.js \
-		test_browserElement_inproc_KeyEvents.html \
-		browserElement_XFrameOptions.js \
-		test_browserElement_inproc_XFrameOptions.html \
-		file_browserElement_XFrameOptions.sjs \
-		browserElement_XFrameOptionsDeny.js \
-		test_browserElement_inproc_XFrameOptionsDeny.html \
-		file_browserElement_XFrameOptionsDeny.html \
-		browserElement_XFrameOptionsSameOrigin.js \
-		test_browserElement_inproc_XFrameOptionsSameOrigin.html \
-		file_browserElement_XFrameOptionsSameOrigin.html \
-		browserElement_XFrameOptionsAllowFrom.js \
-		test_browserElement_inproc_XFrameOptionsAllowFrom.html \
-		file_browserElement_XFrameOptionsAllowFrom.html \
-		file_browserElement_XFrameOptionsAllowFrom.sjs \
-		browserElement_FirstPaint.js \
-		test_browserElement_inproc_FirstPaint.html \
-		browserElement_NextPaint.js \
-		test_browserElement_inproc_NextPaint.html \
-		test_browserElement_oop_NextPaint.html \
-		file_browserElement_NextPaint.html \
-		browserElement_Alert.js \
-		test_browserElement_inproc_Alert.html \
-		browserElement_AlertInFrame.js \
-		test_browserElement_inproc_AlertInFrame.html \
-		file_browserElement_AlertInFrame.html \
-		file_browserElement_AlertInFrame_Inner.html \
-		browserElement_TargetTop.js \
-		test_browserElement_inproc_TargetTop.html \
-		file_browserElement_TargetTop.html \
-		browserElement_ForwardName.js \
-		test_browserElement_inproc_ForwardName.html \
-		file_browserElement_ForwardName.html \
-		browserElement_TargetBlank.js \
-		test_browserElement_inproc_TargetBlank.html \
-		file_browserElement_TargetBlank.html \
-		browserElement_PromptCheck.js \
-		test_browserElement_inproc_PromptCheck.html \
-		browserElement_PromptConfirm.js \
-		test_browserElement_inproc_PromptConfirm.html \
-		browserElement_CookiesNotThirdParty.js \
-		file_browserElement_CookiesNotThirdParty.html \
-		test_browserElement_inproc_CookiesNotThirdParty.html \
-		browserElement_Close.js \
-		test_browserElement_inproc_Close.html \
-		browserElement_CloseFromOpener.js \
-		test_browserElement_inproc_CloseFromOpener.html \
-		file_browserElement_CloseFromOpener.html \
-		browserElement_CloseApp.js \
-		test_browserElement_inproc_CloseApp.html \
-		file_browserElement_CloseApp.html \
-		browserElement_OpenWindow.js \
-		test_browserElement_inproc_OpenWindow.html \
-		file_browserElement_Open1.html \
-		file_browserElement_Open2.html \
-		browserElement_OpenWindowInFrame.js \
-		test_browserElement_inproc_OpenWindowInFrame.html \
-		file_browserElement_OpenWindowInFrame.html \
-		browserElement_OpenWindowRejected.js \
-		test_browserElement_inproc_OpenWindowRejected.html \
-		file_browserElement_OpenWindowRejected.html \
-		browserElement_OpenWindowDifferentOrigin.js \
-		test_browserElement_inproc_OpenWindowDifferentOrigin.html \
-		file_browserElement_OpenWindowDifferentOrigin.html \
-		browserElement_OpenNamed.js \
-		test_browserElement_inproc_OpenNamed.html \
-		file_browserElement_OpenNamed.html \
-		file_browserElement_OpenNamed2.html \
-		browserElement_SecurityChange.js \
-		test_browserElement_inproc_SecurityChange.html \
-		file_browserElement_SecurityChange.html \
-		browserElement_BackForward.js \
-		test_browserElement_inproc_BackForward.html \
-		file_bug741717.sjs \
-		browserElement_Reload.js \
-		file_bug709759.sjs \
-		browserElement_Stop.js \
-		test_browserElement_inproc_Stop.html \
-		browserElement_ContextmenuEvents.js \
-		test_browserElement_inproc_ContextmenuEvents.html \
-		browserElement_SendEvent.js \
-		test_browserElement_inproc_SendEvent.html \
-		browserElement_ScrollEvent.js \
-		test_browserElement_inproc_ScrollEvent.html \
-		browserElement_Auth.js \
-		test_browserElement_inproc_Auth.html \
-		file_http_401_response.sjs \
-		browserElement_RemoveBrowserElement.js \
-		test_browserElement_inproc_RemoveBrowserElement.html \
-		browserElement_DOMRequestError.js \
-		test_browserElement_inproc_DOMRequestError.html \
-		file_browserElement_AppFramePermission.html \
-		browserElement_AppFramePermission.js \
-		test_browserElement_inproc_AppFramePermission.html \
-		file_wyciwyg.html \
-		browserElement_ExposableURI.js \
-		test_browserElement_inproc_ExposableURI.html \
-		browserElement_FrameWrongURI.js \
-		test_browserElement_inproc_FrameWrongURI.html \
-		file_browserElement_FrameWrongURI.html \
-		file_post_request.html \
-		test_browserElement_inproc_ReloadPostRequest.html \
-		browserElement_ReloadPostRequest.js \
-		browserElement_PurgeHistory.js \
-		test_browserElement_inproc_PurgeHistory.html \
-		browserElement_DocumentFirstPaint.js \
-		test_browserElement_inproc_DocumentFirstPaint.html \
-		browserElement_VisibilityChange.js \
-		test_browserElement_inproc_VisibilityChange.html \
-		browserElement_BrowserWindowResize.js \
-		test_browserElement_inproc_BrowserWindowResize.html \
-		$(NULL)
-
-# Disabled until we fix bug 906096.
-#		browserElement_SetInputMethodActive.js \
-#		test_browserElement_inproc_SetInputMethodActive.html \
-#		file_inputmethod.html \
-
-# Disabled due to https://bugzilla.mozilla.org/show_bug.cgi?id=774100
-#		test_browserElement_inproc_Reload.html \
-
-# Disabled due to focus issues (no bug that I'm aware of)
-# 		test_browserElement_oop_KeyEvents.html \
-
-# Disable due to certificate issue (no bug that I'm aware of)
-#		test_browserElement_inproc_ErrorSecurity.html \
-
-# OOP tests don't work on native-fennec (bug 774939).
-#
-# Both the "inproc" and "oop" versions of OpenMixedProcess open remote frames,
-# so we don't run that test on platforms which don't support OOP tests.
-
-
-# Bug 960345 - Disabled on OSX debug for frequent crashes.
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-ifdef MOZ_DEBUG
-OSX_DEBUG=1
-endif
-endif
-
-ifndef MOZ_ANDROID_OMTC #{
-ifndef OSX_DEBUG
-MOCHITEST_FILES += \
-		browserElement_OpenMixedProcess.js \
-		file_browserElement_OpenMixedProcess.html \
-		test_browserElement_inproc_OpenMixedProcess.html \
-		test_browserElement_inproc_ErrorSecurity.html \
-		test_browserElement_oop_OpenMixedProcess.html \
-		test_browserElement_oop_LoadEvents.html \
-		test_browserElement_oop_DataURI.html \
-		test_browserElement_oop_ErrorSecurity.html \
-		test_browserElement_oop_Titlechange.html \
-		test_browserElement_oop_AppWindowNamespace.html \
-		test_browserElement_oop_BrowserWindowNamespace.html \
-		test_browserElement_oop_TopBarrier.html \
-		test_browserElement_oop_Iconchange.html \
-		test_browserElement_oop_Metachange.html \
-		test_browserElement_oop_Opensearch.html \
-		test_browserElement_oop_GetScreenshot.html \
-		test_browserElement_oop_GetScreenshotDppx.html \
-		test_browserElement_oop_BadScreenshot.html \
-		test_browserElement_oop_XFrameOptions.html \
-		test_browserElement_oop_XFrameOptionsDeny.html \
-		test_browserElement_oop_XFrameOptionsSameOrigin.html \
-		test_browserElement_oop_XFrameOptionsAllowFrom.html \
-		test_browserElement_oop_SendEvent.html \
-		test_browserElement_oop_SetVisible.html \
-		test_browserElement_oop_SetVisibleFrames.html \
-		test_browserElement_oop_SetVisibleFrames2.html \
-		test_browserElement_oop_Alert.html \
-		test_browserElement_oop_AlertInFrame.html \
-		test_browserElement_oop_TargetTop.html \
-		test_browserElement_oop_FirstPaint.html \
-		test_browserElement_oop_ForwardName.html \
-		test_browserElement_oop_TargetBlank.html \
-		test_browserElement_oop_PromptCheck.html \
-		test_browserElement_oop_PromptConfirm.html \
-		test_browserElement_oop_CookiesNotThirdParty.html \
-		test_browserElement_oop_Close.html \
-		test_browserElement_oop_OpenWindow.html \
-		test_browserElement_oop_OpenWindowInFrame.html \
-		test_browserElement_oop_OpenWindowRejected.html \
-		test_browserElement_oop_OpenWindowDifferentOrigin.html \
-		test_browserElement_oop_OpenNamed.html \
-		test_browserElement_oop_SecurityChange.html \
-		test_browserElement_oop_BackForward.html \
-		test_browserElement_oop_Reload.html \
-		test_browserElement_oop_Stop.html \
-		test_browserElement_oop_ScrollEvent.html \
-		test_browserElement_oop_Auth.html \
-		test_browserElement_oop_RemoveBrowserElement.html \
-		test_browserElement_oop_DOMRequestError.html \
-		test_browserElement_oop_AppFramePermission.html \
-		test_browserElement_oop_FrameWrongURI.html \
-		test_browserElement_oop_ReloadPostRequest.html \
-		test_browserElement_oop_PurgeHistory.html \
-		test_browserElement_oop_DocumentFirstPaint.html \
-		test_browserElement_oop_VisibilityChange.html \
-		test_browserElement_oop_BrowserWindowResize.html \
-	$(NULL)
-
-# Disabled until bug 930449 makes it stop timing out
-#		test_browserElement_oop_ContextmenuEvents.html \
-
-# Disabled until bug 924771 makes them stop timing out
-# 		test_browserElement_oop_CloseFromOpener.html \
-#		test_browserElement_oop_CloseApp.html \
-#		test_browserElement_oop_ExposableURI.html \
-
-# Disabled until we fix bug 906096.
-#		test_browserElement_oop_SetInputMethodActive.html \
-
-endif # OSX_DEBUG
-endif #}
new file mode 100644
--- /dev/null
+++ b/dom/browser-element/mochitest/mochitest-oop.ini
@@ -0,0 +1,77 @@
+[DEFAULT]
+# Both the "inproc" and "oop" versions of OpenMixedProcess open remote frames,
+# so we don't run that test on platforms which don't support OOP tests.
+# OOP tests don't work on native-fennec (bug 774939).
+# Bug 960345 - Disabled on OSX debug for frequent crashes.
+skip-if = os == "android" || (toolkit == "cocoa" && debug)
+support-files =
+  browserElement_OpenMixedProcess.js
+  file_browserElement_OpenMixedProcess.html
+
+[test_browserElement_inproc_ErrorSecurity.html]
+[test_browserElement_inproc_OpenMixedProcess.html]
+[test_browserElement_oop_Alert.html]
+[test_browserElement_oop_AlertInFrame.html]
+[test_browserElement_oop_AppFramePermission.html]
+[test_browserElement_oop_AppWindowNamespace.html]
+[test_browserElement_oop_Auth.html]
+[test_browserElement_oop_BackForward.html]
+[test_browserElement_oop_BadScreenshot.html]
+[test_browserElement_oop_BrowserWindowNamespace.html]
+[test_browserElement_oop_BrowserWindowResize.html]
+[test_browserElement_oop_Close.html]
+[test_browserElement_oop_CookiesNotThirdParty.html]
+[test_browserElement_oop_DOMRequestError.html]
+[test_browserElement_oop_DataURI.html]
+[test_browserElement_oop_DocumentFirstPaint.html]
+[test_browserElement_oop_ErrorSecurity.html]
+[test_browserElement_oop_FirstPaint.html]
+[test_browserElement_oop_ForwardName.html]
+[test_browserElement_oop_FrameWrongURI.html]
+[test_browserElement_oop_GetScreenshot.html]
+[test_browserElement_oop_GetScreenshotDppx.html]
+[test_browserElement_oop_Iconchange.html]
+[test_browserElement_oop_LoadEvents.html]
+[test_browserElement_oop_Metachange.html]
+[test_browserElement_oop_OpenMixedProcess.html]
+[test_browserElement_oop_OpenNamed.html]
+[test_browserElement_oop_OpenWindow.html]
+[test_browserElement_oop_OpenWindowDifferentOrigin.html]
+[test_browserElement_oop_OpenWindowInFrame.html]
+[test_browserElement_oop_OpenWindowRejected.html]
+[test_browserElement_oop_Opensearch.html]
+[test_browserElement_oop_PromptCheck.html]
+[test_browserElement_oop_PromptConfirm.html]
+[test_browserElement_oop_PurgeHistory.html]
+[test_browserElement_oop_Reload.html]
+[test_browserElement_oop_ReloadPostRequest.html]
+[test_browserElement_oop_RemoveBrowserElement.html]
+[test_browserElement_oop_ScrollEvent.html]
+[test_browserElement_oop_SecurityChange.html]
+[test_browserElement_oop_SendEvent.html]
+[test_browserElement_oop_SetVisible.html]
+[test_browserElement_oop_SetVisibleFrames.html]
+[test_browserElement_oop_SetVisibleFrames2.html]
+[test_browserElement_oop_Stop.html]
+[test_browserElement_oop_TargetBlank.html]
+[test_browserElement_oop_TargetTop.html]
+[test_browserElement_oop_Titlechange.html]
+[test_browserElement_oop_TopBarrier.html]
+[test_browserElement_oop_VisibilityChange.html]
+[test_browserElement_oop_XFrameOptions.html]
+[test_browserElement_oop_XFrameOptionsAllowFrom.html]
+[test_browserElement_oop_XFrameOptionsDeny.html]
+[test_browserElement_oop_XFrameOptionsSameOrigin.html]
+# Disabled until bug 930449 makes it stop timing out
+[test_browserElement_oop_ContextmenuEvents.html]
+disabled = bug 930449
+# Disabled until bug 924771 makes them stop timing out
+[test_browserElement_oop_CloseFromOpener.html]
+disabled = bug 924771
+[test_browserElement_oop_CloseApp.html]
+disabled = bug 924771
+[test_browserElement_oop_ExposableURI.html]
+disabled = bug 924771
+# Disabled until we fix bug 906096.
+[test_browserElement_oop_SetInputMethodActive.html]
+disabled = bug 906096
new file mode 100644
--- /dev/null
+++ b/dom/browser-element/mochitest/mochitest.ini
@@ -0,0 +1,177 @@
+[DEFAULT]
+support-files =
+  ../../../browser/base/content/test/general/audio.ogg
+  ../../../content/media/test/short-video.ogv
+  browserElementTestHelpers.js
+  browserElement_Alert.js
+  browserElement_AlertInFrame.js
+  browserElement_AppFramePermission.js
+  browserElement_AppWindowNamespace.js
+  browserElement_Auth.js
+  browserElement_BackForward.js
+  browserElement_BadScreenshot.js
+  browserElement_BrowserWindowNamespace.js
+  browserElement_BrowserWindowResize.js
+  browserElement_Close.js
+  browserElement_CloseApp.js
+  browserElement_CloseFromOpener.js
+  browserElement_ContextmenuEvents.js
+  browserElement_CookiesNotThirdParty.js
+  browserElement_DOMRequestError.js
+  browserElement_DataURI.js
+  browserElement_DocumentFirstPaint.js
+  browserElement_ErrorSecurity.js
+  browserElement_ExposableURI.js
+  browserElement_FirstPaint.js
+  browserElement_ForwardName.js
+  browserElement_FrameWrongURI.js
+  browserElement_GetScreenshot.js
+  browserElement_GetScreenshotDppx.js
+  browserElement_Iconchange.js
+  browserElement_KeyEvents.js
+  browserElement_LoadEvents.js
+  browserElement_Metachange.js
+  browserElement_NextPaint.js
+  browserElement_OpenNamed.js
+  browserElement_OpenWindow.js
+  browserElement_OpenWindowDifferentOrigin.js
+  browserElement_OpenWindowInFrame.js
+  browserElement_OpenWindowRejected.js
+  browserElement_Opensearch.js
+  browserElement_PromptCheck.js
+  browserElement_PromptConfirm.js
+  browserElement_PurgeHistory.js
+  browserElement_Reload.js
+  browserElement_ReloadPostRequest.js
+  browserElement_RemoveBrowserElement.js
+  browserElement_ScrollEvent.js
+  browserElement_SecurityChange.js
+  browserElement_SendEvent.js
+  browserElement_SetVisible.js
+  browserElement_SetVisibleFrames.js
+  browserElement_SetVisibleFrames2.js
+  browserElement_Stop.js
+  browserElement_TargetBlank.js
+  browserElement_TargetTop.js
+  browserElement_Titlechange.js
+  browserElement_TopBarrier.js
+  browserElement_VisibilityChange.js
+  browserElement_XFrameOptions.js
+  browserElement_XFrameOptionsAllowFrom.js
+  browserElement_XFrameOptionsDeny.js
+  browserElement_XFrameOptionsSameOrigin.js
+  file_browserElement_AlertInFrame.html
+  file_browserElement_AlertInFrame_Inner.html
+  file_browserElement_AppFramePermission.html
+  file_browserElement_AppWindowNamespace.html
+  file_browserElement_BrowserWindowNamespace.html
+  file_browserElement_CloseApp.html
+  file_browserElement_CloseFromOpener.html
+  file_browserElement_CookiesNotThirdParty.html
+  file_browserElement_ForwardName.html
+  file_browserElement_FrameWrongURI.html
+  file_browserElement_LoadEvents.html
+  file_browserElement_Metachange.sjs
+  file_browserElement_NextPaint.html
+  file_browserElement_Open1.html
+  file_browserElement_Open2.html
+  file_browserElement_OpenNamed.html
+  file_browserElement_OpenNamed2.html
+  file_browserElement_OpenWindowDifferentOrigin.html
+  file_browserElement_OpenWindowInFrame.html
+  file_browserElement_OpenWindowRejected.html
+  file_browserElement_SecurityChange.html
+  file_browserElement_SetVisibleFrames2_Outer.html
+  file_browserElement_SetVisibleFrames_Inner.html
+  file_browserElement_SetVisibleFrames_Outer.html
+  file_browserElement_TargetBlank.html
+  file_browserElement_TargetTop.html
+  file_browserElement_XFrameOptions.sjs
+  file_browserElement_XFrameOptionsAllowFrom.html
+  file_browserElement_XFrameOptionsAllowFrom.sjs
+  file_browserElement_XFrameOptionsDeny.html
+  file_browserElement_XFrameOptionsSameOrigin.html
+  file_bug709759.sjs
+  file_bug741717.sjs
+  file_empty.html
+  file_empty_script.js
+  file_focus.html
+  file_http_401_response.sjs
+  file_post_request.html
+  file_wyciwyg.html
+
+# Note: browserElementTestHelpers.js looks at the test's filename to determine
+# whether the test should be OOP.  "_oop_" signals OOP, "_inproc_" signals in
+# process.  Default is OOP.
+[test_browserElement_NoAttr.html]
+[test_browserElement_NoPref.html]
+[test_browserElement_NoWhitelist.html]
+[test_browserElement_inproc_Alert.html]
+[test_browserElement_inproc_AlertInFrame.html]
+[test_browserElement_inproc_AppFramePermission.html]
+[test_browserElement_inproc_AppWindowNamespace.html]
+[test_browserElement_inproc_Auth.html]
+[test_browserElement_inproc_BackForward.html]
+[test_browserElement_inproc_BadScreenshot.html]
+[test_browserElement_inproc_BrowserWindowNamespace.html]
+[test_browserElement_inproc_BrowserWindowResize.html]
+[test_browserElement_inproc_Close.html]
+[test_browserElement_inproc_CloseApp.html]
+[test_browserElement_inproc_CloseFromOpener.html]
+[test_browserElement_inproc_ContextmenuEvents.html]
+[test_browserElement_inproc_CookiesNotThirdParty.html]
+[test_browserElement_inproc_DOMRequestError.html]
+[test_browserElement_inproc_DataURI.html]
+[test_browserElement_inproc_DocumentFirstPaint.html]
+[test_browserElement_inproc_ExposableURI.html]
+[test_browserElement_inproc_FirstPaint.html]
+[test_browserElement_inproc_ForwardName.html]
+[test_browserElement_inproc_FrameWrongURI.html]
+[test_browserElement_inproc_GetScreenshot.html]
+[test_browserElement_inproc_GetScreenshotDppx.html]
+[test_browserElement_inproc_Iconchange.html]
+[test_browserElement_inproc_KeyEvents.html]
+[test_browserElement_inproc_LoadEvents.html]
+[test_browserElement_inproc_Metachange.html]
+[test_browserElement_inproc_NextPaint.html]
+[test_browserElement_inproc_OpenNamed.html]
+[test_browserElement_inproc_OpenWindow.html]
+[test_browserElement_inproc_OpenWindowDifferentOrigin.html]
+[test_browserElement_inproc_OpenWindowInFrame.html]
+[test_browserElement_inproc_OpenWindowRejected.html]
+[test_browserElement_inproc_Opensearch.html]
+[test_browserElement_inproc_PromptCheck.html]
+[test_browserElement_inproc_PromptConfirm.html]
+[test_browserElement_inproc_PurgeHistory.html]
+[test_browserElement_inproc_ReloadPostRequest.html]
+[test_browserElement_inproc_RemoveBrowserElement.html]
+[test_browserElement_inproc_ScrollEvent.html]
+[test_browserElement_inproc_SecurityChange.html]
+[test_browserElement_inproc_SendEvent.html]
+[test_browserElement_inproc_SetVisible.html]
+[test_browserElement_inproc_SetVisibleFrames.html]
+[test_browserElement_inproc_SetVisibleFrames2.html]
+[test_browserElement_inproc_Stop.html]
+[test_browserElement_inproc_TargetBlank.html]
+[test_browserElement_inproc_TargetTop.html]
+[test_browserElement_inproc_Titlechange.html]
+[test_browserElement_inproc_TopBarrier.html]
+[test_browserElement_inproc_VisibilityChange.html]
+[test_browserElement_inproc_XFrameOptions.html]
+[test_browserElement_inproc_XFrameOptionsAllowFrom.html]
+[test_browserElement_inproc_XFrameOptionsDeny.html]
+[test_browserElement_inproc_XFrameOptionsSameOrigin.html]
+[test_browserElement_oop_NextPaint.html]
+# Disabled until we fix bug 906096.
+[test_browserElement_inproc_SetInputMethodActive.html]
+disabled = bug 906096
+support-files = browserElement_SetInputMethodActive.js file_inputmethod.html
+# Disabled due to https://bugzilla.mozilla.org/show_bug.cgi?id=774100
+[test_browserElement_inproc_Reload.html]
+disabled = bug 774100
+# Disabled due to focus issues (no bug that I'm aware of)
+[test_browserElement_oop_KeyEvents.html]
+disabled =
+# Disable due to certificate issue (no bug that I'm aware of)
+[test_browserElement_inproc_ErrorSecurity.html]
+disabled =
deleted file mode 100644
--- a/dom/browser-element/mochitest/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['priority/mochitest.ini']
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -1,16 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['mochitest']
-
 EXPORTS.mozilla += [
     'BrowserElementParent.h',
 ]
 
 SOURCES += [
     'BrowserElementParent.cpp',
 ]
 
@@ -37,8 +35,13 @@ FINAL_LIBRARY = 'gklayout'
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/dom/',
     '/dom/base',
     '/dom/ipc',
 ]
 
+MOCHITEST_MANIFESTS += [
+    'mochitest/mochitest-oop.ini',
+    'mochitest/mochitest.ini',
+    'mochitest/priority/mochitest.ini',
+]
deleted file mode 100644
--- a/dom/devicestorage/ipc/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_FILES := ../test/devicestorage_common.js
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/dom/devicestorage/ipc/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@@ -1,16 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test', 'ipc']
-
 EXPORTS += [
     'DeviceStorage.h',
     'DeviceStorageFileDescriptor.h',
     'nsDeviceStorage.h',
 ]
 
 EXPORTS.mozilla.dom.devicestorage += [
     'DeviceStorageRequestChild.h',
@@ -34,8 +32,13 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/dom/base',
     '/dom/events',
     '/dom/ipc',
 ]
 
+MOCHITEST_MANIFESTS += [
+    'ipc/mochitest.ini',
+    'test/mochitest.ini',
+]
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
deleted file mode 100644
--- a/dom/devicestorage/test/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -1,16 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 EXPORTS += [
     'nsCanvasFrame.h',
     'nsDirection.h',
     'nsFrameIdList.h',
     'nsFrameList.h',
     'nsFrameSelection.h',
     'nsFrameState.h',
     'nsFrameStateBits.h',
@@ -126,8 +124,11 @@ LOCAL_INCLUDES += [
     '../xul',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
 
 RESOURCE_FILES.html = [
     'folder.png',
 ]
+
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
deleted file mode 100644
--- a/layout/generic/test/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_FILES += \
-  $(srcdir)/../../reftests/backgrounds/blue-32x32.png \
-  $(srcdir)/../../reftests/backgrounds/fuchsia-32x32.png \
-  $(srcdir)/../../base/tests/enableTestPlugin.js \
-  $(NULL)
--- a/layout/generic/test/mochitest.ini
+++ b/layout/generic/test/mochitest.ini
@@ -1,10 +1,13 @@
 [DEFAULT]
 support-files =
+  ../../reftests/backgrounds/blue-32x32.png
+  ../../reftests/backgrounds/fuchsia-32x32.png
+  ../../base/tests/enableTestPlugin.js
   plugin_clipping_helper.xhtml
   plugin_clipping_helper2.xhtml
   plugin_clipping_helper_transformed.xhtml
   plugin_clipping_helper_table.xhtml
   plugin_clipping_lib.js
   plugin_focus_helper.html
   file_BrokenImageReference.png
   file_Dolske.png
deleted file mode 100644
--- a/layout/generic/test/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
--- a/layout/moz.build
+++ b/layout/moz.build
@@ -18,17 +18,19 @@ PARALLEL_DIRS += [
     'tools/recording',
 ]
 
 if CONFIG['NS_PRINTING']:
     PARALLEL_DIRS += ['printing']
 
 TEST_TOOL_DIRS += [
     'tools/reftest',
-    'reftests/fonts',
-    'reftests/fonts/mplus',
 ]
 
 DIRS += ['build', 'media']
 
 if CONFIG['MOZ_DEBUG']:
     TEST_DIRS += ['tools/layout-debug']
 
+MOCHITEST_MANIFESTS += [
+    'reftests/fonts/mochitest.ini',
+    'reftests/fonts/mplus/mochitest.ini',
+]
deleted file mode 100644
--- a/layout/reftests/fonts/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-relativesrcdir  = fonts
-
-MOCHITEST_FILES = \
-  Ahem.ttf \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/layout/reftests/fonts/mochitest.ini
@@ -0,0 +1,3 @@
+[DEFAULT]
+support-files =
+  /tests/fonts/Ahem.ttf
deleted file mode 100644
--- a/layout/reftests/fonts/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
deleted file mode 100644
--- a/layout/reftests/fonts/mplus/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-relativesrcdir  = fonts/mplus
-
-MOCHITEST_FILES = \
-  mplus-1p-regular.ttf \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/layout/reftests/fonts/mplus/mochitest.ini
@@ -0,0 +1,3 @@
+[DEFAULT]
+support-files =
+  /tests/fonts/mplus/mplus-1p-regular.ttf
deleted file mode 100644
--- a/layout/reftests/fonts/mplus/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -9,32 +9,17 @@
 # it buildable again.
 #
 # TestCSSPropertyLookup.cpp needs the internal XPCOM APIs and so cannot
 # be built with libxul enabled.
 #
 #CPP_UNIT_TESTS = TestCSSPropertyLookup.cpp
 #LIBS += ../nsCSSKeywords.$(OBJ_SUFFIX) ../nsCSSProps.$(OBJ_SUFFIX) $(XPCOM_LIBS)
 
-VISITED_REFTEST_FILES = \
-		$(shell find $(topsrcdir)/layout/reftests/css-visited/ -name '*.html' -o -name '*.xhtml') \
-		$(topsrcdir)/layout/reftests/svg/pseudo-classes-02.svg \
-		$(topsrcdir)/layout/reftests/svg/pseudo-classes-02-ref.svg \
-		$(topsrcdir)/layout/reftests/svg/as-image/lime100x100.svg \
-		$(topsrcdir)/layout/reftests/svg/as-image/svg-image-visited-1-helper.svg \
-		$(topsrcdir)/layout/reftests/svg/as-image/svg-image-visited-2-helper.svg \
-		$(NULL)
-VISITED_REFTEST_DEST = $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)/css-visited/
-INSTALL_TARGETS += VISITED_REFTEST
-
 ifdef COMPILE_ENVIRONMENT
-MOCHITEST_FILES += \
-		test_property_database.html \
-		css_properties.js \
-		$(NULL)
-
 css_properties.js: host_ListCSSProperties$(HOST_BIN_SUFFIX) css_properties_like_longhand.js Makefile
 	$(RM) $@
 	./host_ListCSSProperties$(HOST_BIN_SUFFIX) > $@
 	cat $(srcdir)/css_properties_like_longhand.js >> $@
 
-GARBAGE += css_properties.js
+GARBAGE += css_properties.jsm
+MOCHITEST_FILES += css_properties.js
 endif
new file mode 100644
--- /dev/null
+++ b/layout/style/test/css-visited/mochitest.ini
@@ -0,0 +1,75 @@
+[DEFAULT]
+support-files =
+  ../../../../layout/reftests/css-visited/color-on-text-decoration-1-ref.html
+  ../../../../layout/reftests/css-visited/selector-descendant-2-ref.xhtml
+  ../../../../layout/reftests/css-visited/selector-child-1-ref.html
+  ../../../../layout/reftests/css-visited/subject-of-selector-descendant-1.html
+  ../../../../layout/reftests/css-visited/inherit-keyword-1-ref.html
+  ../../../../layout/reftests/css-visited/visited-page.html
+  ../../../../layout/reftests/css-visited/border-2b.html
+  ../../../../layout/reftests/css-visited/color-on-link-before-1.html
+  ../../../../layout/reftests/css-visited/border-2a.html
+  ../../../../layout/reftests/css-visited/color-on-visited-1.html
+  ../../../../layout/reftests/css-visited/selector-adj-sibling-1.html
+  ../../../../layout/reftests/css-visited/selector-any-sibling-1.html
+  ../../../../layout/reftests/css-visited/column-rule-1.html
+  ../../../../layout/reftests/css-visited/selector-child-1.html
+  ../../../../layout/reftests/css-visited/subject-of-selector-any-sibling-1.html
+  ../../../../layout/reftests/css-visited/content-before-1-ref.html
+  ../../../../layout/reftests/css-visited/color-on-link-1-ref.html
+  ../../../../layout/reftests/css-visited/color-choice-1-ref.html
+  ../../../../layout/reftests/css-visited/subject-of-selector-descendant-2.xhtml
+  ../../../../layout/reftests/css-visited/width-on-visited-1.html
+  ../../../../layout/reftests/css-visited/selector-child-2-ref.xhtml
+  ../../../../layout/reftests/css-visited/border-1.html
+  ../../../../layout/reftests/css-visited/link-root-1.xhtml
+  ../../../../layout/reftests/css-visited/link-root-1-ref.xhtml
+  ../../../../layout/reftests/css-visited/color-on-visited-1-ref.html
+  ../../../../layout/reftests/css-visited/selector-any-sibling-1-ref.html
+  ../../../../layout/reftests/css-visited/border-1-ref.html
+  ../../../../layout/reftests/css-visited/column-rule-1-ref.html
+  ../../../../layout/reftests/css-visited/content-on-link-before-1.html
+  ../../../../layout/reftests/css-visited/color-on-link-1.html
+  ../../../../layout/reftests/css-visited/selector-descendant-2.xhtml
+  ../../../../layout/reftests/css-visited/content-color-on-visited-before-1.html
+  ../../../../layout/reftests/css-visited/inherit-keyword-1.xhtml
+  ../../../../layout/reftests/css-visited/selector-descendant-1-ref.html
+  ../../../../layout/reftests/css-visited/subject-of-selector-descendant-2-ref.xhtml
+  ../../../../layout/reftests/css-visited/selector-adj-sibling-2-ref.html
+  ../../../../layout/reftests/css-visited/border-2-ref.html
+  ../../../../layout/reftests/css-visited/mathml-links.html
+  ../../../../layout/reftests/css-visited/selector-child-2.xhtml
+  ../../../../layout/reftests/css-visited/column-rule-1-notref.html
+  ../../../../layout/reftests/css-visited/white-to-transparent-1-ref.html
+  ../../../../layout/reftests/css-visited/first-line-1.html
+  ../../../../layout/reftests/css-visited/selector-any-sibling-2-ref.html
+  ../../../../layout/reftests/css-visited/content-color-on-visited-before-1-ref.html
+  ../../../../layout/reftests/css-visited/color-on-bullets-1.html
+  ../../../../layout/reftests/css-visited/outline-1-ref.html
+  ../../../../layout/reftests/css-visited/content-on-visited-before-1.html
+  ../../../../layout/reftests/css-visited/color-choice-1.html
+  ../../../../layout/reftests/css-visited/selector-adj-sibling-2.html
+  ../../../../layout/reftests/css-visited/selector-descendant-1.html
+  ../../../../layout/reftests/css-visited/subject-of-selector-1-ref.html
+  ../../../../layout/reftests/css-visited/white-to-transparent-1.html
+  ../../../../layout/reftests/css-visited/width-on-link-1.html
+  ../../../../layout/reftests/css-visited/mathml-links-ref.html
+  ../../../../layout/reftests/css-visited/outline-1.html
+  ../../../../layout/reftests/css-visited/color-on-bullets-1-ref.html
+  ../../../../layout/reftests/css-visited/selector-adj-sibling-1-ref.html
+  ../../../../layout/reftests/css-visited/subject-of-selector-adj-sibling-1.html
+  ../../../../layout/reftests/css-visited/border-collapse-1-ref.html
+  ../../../../layout/reftests/css-visited/first-line-1-ref.html
+  ../../../../layout/reftests/css-visited/border-collapse-1.html
+  ../../../../layout/reftests/css-visited/selector-any-sibling-2.html
+  ../../../../layout/reftests/css-visited/width-1-ref.html
+  ../../../../layout/reftests/css-visited/color-on-visited-before-1.html
+  ../../../../layout/reftests/css-visited/color-on-text-decoration-1.html
+  ../../../../layout/reftests/css-visited/content-color-on-link-before-1-ref.html
+  ../../../../layout/reftests/css-visited/subject-of-selector-child-1.html
+  ../../../../layout/reftests/css-visited/content-color-on-link-before-1.html
+  ../../../../layout/reftests/svg/pseudo-classes-02.svg
+  ../../../../layout/reftests/svg/pseudo-classes-02-ref.svg
+  ../../../../layout/reftests/svg/as-image/lime100x100.svg
+  ../../../../layout/reftests/svg/as-image/svg-image-visited-1-helper.svg
+  ../../../../layout/reftests/svg/as-image/svg-image-visited-2-helper.svg
--- a/layout/style/test/mochitest.ini
+++ b/layout/style/test/mochitest.ini
@@ -1,14 +1,15 @@
 [DEFAULT]
 support-files =
   animation_utils.js
   ccd-quirks.html
   ccd.sjs
   ccd-standards.html
+  css_properties.js
   descriptor_database.js
   empty.html
   media_queries_dynamic_xbl_binding.xml
   media_queries_dynamic_xbl_iframe.html
   media_queries_dynamic_xbl_style.css
   media_queries_iframe.html
   post-redirect-1.css
   post-redirect-2.css
@@ -22,16 +23,17 @@ support-files =
   unstyled.xml
   viewport_units_iframe.html
   visited_image_loading_frame_empty.html
   visited_image_loading_frame.html
   visited_image_loading.sjs
   visited-lying-inner.html
   visited-pref-iframe.html
   xbl_bindings.xml
+generated-files = css_properties.js
 
 [test_acid3_test46.html]
 [test_all_shorthand.html]
 [test_animations.html]
 skip-if = toolkit == 'android'
 [test_any_dynamic.html]
 [test_at_rule_parse_serialize.html]
 [test_bug73586.html]
@@ -213,8 +215,10 @@ skip-if = toolkit == 'android' #TIMED_OU
 [test_bug525952.html]
 [test_load_events_on_stylesheets.html]
 [test_page_parser.html]
 [test_bug732153.html]
 [test_bug732209.html]
 support-files = bug732209-css.sjs
 [test_bug795520.html]
 [test_background_blend_mode.html]
+[test_property_database.html]
+
--- a/layout/style/test/moz.build
+++ b/layout/style/test/moz.build
@@ -9,14 +9,15 @@ HOST_SOURCES += [
 ]
 
 HOST_SIMPLE_PROGRAMS += [
     'host_%s' % f.replace('.cpp', '') for f in HOST_SOURCES
 ]
 
 MOCHITEST_MANIFESTS += [
     'chrome/mochitest.ini',
+    'css-visited/mochitest.ini',
     'mochitest.ini',
 ]
 BROWSER_CHROME_MANIFESTS += ['browser.ini']
 MOCHITEST_CHROME_MANIFESTS += ['chrome/chrome.ini']
 
 DEFINES['MOZILLA_INTERNAL_API'] = True
--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@@ -1,18 +1,17 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test/browser']
-
 MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 
 XPIDL_SOURCES += [
     'nsIFormAutoComplete.idl',
     'nsIFormFillController.idl',
     'nsIFormHistory.idl',
     'nsIInputListAutoComplete.idl',
 ]
 
deleted file mode 100644
--- a/toolkit/components/satchel/test/browser/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_BROWSER_FILES := ../subtst_privbrowsing.html
deleted file mode 100644
--- a/toolkit/components/satchel/test/browser/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-BROWSER_CHROME_MANIFESTS += ['browser.ini']
-
deleted file mode 100644
--- a/toolkit/content/tests/chrome/Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# test_panel_focus.xul won't work if the Full Keyboard Access preference is set to
-# textboxes and lists only, so skip this test on Mac
-ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-MOCHITEST_CHROME_FILES += test_panel_focus.xul \
-               window_panel_focus.xul \
-               test_chromemargin.xul \
-               window_chromemargin.xul \
-               bug451540_window.xul \
-               test_bug451540.xul
-else
-MOCHITEST_CHROME_FILES += test_autocomplete_mac_caret.xul
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-MOCHITEST_CHROME_FILES += $(filter disabled-temporarily, test_cursorsnap.xul) \
-		window_cursorsnap_dialog.xul \
-		window_cursorsnap_wizard.xul
-endif
-
--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@@ -156,8 +156,25 @@ skip-if = os == "linux"
 [test_toolbar.xul]
 [test_tooltip.xul]
 [test_tooltip_noautohide.xul]
 [test_tree.xul]
 [test_tree_hier.xul]
 [test_tree_hier_cell.xul]
 [test_tree_single.xul]
 [test_tree_view.xul]
+# test_panel_focus.xul won't work if the Full Keyboard Access preference is set to
+# textboxes and lists only, so skip this test on Mac
+[test_panel_focus.xul]
+support-files = window_panel_focus.xul
+skip-if = toolkit == "cocoa"
+[test_chromemargin.xul]
+support-files = window_chromemargin.xul
+skip-if = toolkit == "cocoa"
+[test_bug451540.xul]
+support-files = bug451540_window.xul
+skip-if = toolkit == "cocoa"
+[test_autocomplete_mac_caret.xul]
+skip-if = toolkit != "cocoa"
+[test_cursorsnap.xul]
+disabled =
+#skip-if = os != "win"
+support-files = window_cursorsnap_dialog.xul window_cursorsnap_wizard.xul
deleted file mode 100644
--- a/toolkit/content/tests/chrome/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
--- a/toolkit/content/tests/moz.build
+++ b/toolkit/content/tests/moz.build
@@ -1,11 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['chrome', 'widgets']
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
+
+MOCHITEST_CHROME_MANIFESTS += [
+    'chrome/chrome.ini',
+    'widgets/chrome.ini',
+]
+
+MOCHITEST_MANIFESTS += ['widgets/mochitest.ini']
deleted file mode 100644
--- a/toolkit/content/tests/widgets/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_FILES += \
-  $(topsrcdir)/content/media/test/audio.wav \
-  $(topsrcdir)/browser/base/content/test/general/audio.ogg \
-  $(topsrcdir)/content/media/test/seek_with_sound.ogg \
-  $(NULL)
--- a/toolkit/content/tests/widgets/mochitest.ini
+++ b/toolkit/content/tests/widgets/mochitest.ini
@@ -1,10 +1,13 @@
 [DEFAULT]
 support-files =
+  ../../../../content/media/test/audio.wav
+  ../../../../browser/base/content/test/general/audio.ogg
+  ../../../../content/media/test/seek_with_sound.ogg
   head.js
   tree_shared.js
   videocontrols_direction-1-ref.html
   videocontrols_direction-1a.html
   videocontrols_direction-1b.html
   videocontrols_direction-1c.html
   videocontrols_direction-1d.html
   videocontrols_direction-1e.html
deleted file mode 100644
--- a/toolkit/content/tests/widgets/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-