Back out e9f46c81c28e (bug 924463) on suspicion of being the One True cause of mass browser-chrome orange
authorPhil Ringnalda <philringnalda@gmail.com>
Fri, 18 Oct 2013 18:54:22 -0700
changeset 166126 e25e62d174ed3b232c1ffe3b51580334a23dc577
parent 166125 385fc5d956db1676c191f2a44217cb2d26e5e69d
child 166127 12a1fbf5b88f5e99a2d2464dd9ff1b08c2843fa0
child 166159 c4f64a12e6ef7bb6ae8fed23290a700081c7aebc
child 166173 7b8172aea9ce83d9787bb4466adf997429e02a9d
child 166270 9ed04526b3b85aac07eb67537dfba867e1ad34f1
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs924463
milestone27.0a1
backs oute9f46c81c28e1d8d16fc296d252eefdd5d13b05c
first release with
nightly linux32
e25e62d174ed / 27.0a1 / 20131019030204 / files
nightly linux64
e25e62d174ed / 27.0a1 / 20131019030204 / files
nightly mac
e25e62d174ed / 27.0a1 / 20131019030204 / files
nightly win32
e25e62d174ed / 27.0a1 / 20131019030204 / files
nightly win64
e25e62d174ed / 27.0a1 / 20131019030204 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out e9f46c81c28e (bug 924463) on suspicion of being the One True cause of mass browser-chrome orange CLOSED TREE
browser/components/certerror/moz.build
browser/components/certerror/test/moz.build
browser/components/dirprovider/moz.build
browser/components/dirprovider/tests/moz.build
browser/components/downloads/moz.build
browser/components/downloads/test/browser/moz.build
browser/components/downloads/test/moz.build
browser/components/feeds/moz.build
browser/components/feeds/test/chrome/Makefile.in
browser/components/feeds/test/chrome/chrome.ini
browser/components/feeds/test/chrome/moz.build
browser/components/feeds/test/moz.build
browser/components/migration/moz.build
browser/components/migration/tests/moz.build
browser/components/moz.build
browser/components/places/moz.build
browser/components/places/tests/browser/Makefile.in
browser/components/places/tests/browser/browser.ini
browser/components/places/tests/browser/moz.build
browser/components/places/tests/chrome/moz.build
browser/components/places/tests/moz.build
browser/components/preferences/in-content/moz.build
browser/components/preferences/in-content/tests/moz.build
browser/components/preferences/moz.build
browser/components/preferences/tests/moz.build
browser/components/privatebrowsing/moz.build
browser/components/privatebrowsing/test/browser/moz.build
browser/components/privatebrowsing/test/moz.build
browser/components/safebrowsing/content/test/moz.build
browser/components/safebrowsing/moz.build
browser/components/search/moz.build
browser/components/search/test/moz.build
browser/components/sessionstore/moz.build
browser/components/sessionstore/test/Makefile.in
browser/components/sessionstore/test/browser.ini
browser/components/sessionstore/test/moz.build
browser/components/shell/moz.build
browser/components/shell/test/moz.build
browser/components/tabview/Makefile.in
browser/components/tabview/moz.build
browser/components/tabview/test/moz.build
browser/components/test/moz.build
--- a/browser/components/certerror/moz.build
+++ b/browser/components/certerror/moz.build
@@ -1,9 +1,7 @@
 # -*- 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 += [
-    'test/browser.ini',
-]
+TEST_DIRS += ['test']
new file mode 100644
--- /dev/null
+++ b/browser/components/certerror/test/moz.build
@@ -0,0 +1,8 @@
+# -*- 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']
+
--- a/browser/components/dirprovider/moz.build
+++ b/browser/components/dirprovider/moz.build
@@ -1,21 +1,20 @@
 # -*- 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 += ['tests']
+
 MODULE = 'browserdir'
 
 EXPORTS.mozilla.browser += [
     'DirectoryProvider.h',
 ]
 
 CPP_SOURCES += [
     'DirectoryProvider.cpp',
 ]
 
 LIBRARY_NAME = 'browserdir_s'
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'tests/unit/xpcshell.ini',
-]
new file mode 100644
--- /dev/null
+++ b/browser/components/dirprovider/tests/moz.build
@@ -0,0 +1,9 @@
+# -*- 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/.
+
+MODULE = 'test_browserdir'
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
--- a/browser/components/downloads/moz.build
+++ b/browser/components/downloads/moz.build
@@ -1,15 +1,8 @@
 # -*- 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 += ['src']
-
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini',
-]
-
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser/browser.ini',
-]
+TEST_DIRS += ['test']
new file mode 100644
--- /dev/null
+++ b/browser/components/downloads/test/browser/moz.build
@@ -0,0 +1,8 @@
+# -*- 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']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/downloads/test/moz.build
@@ -0,0 +1,9 @@
+# -*- 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 += ['browser']
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
--- a/browser/components/feeds/moz.build
+++ b/browser/components/feeds/moz.build
@@ -1,19 +1,8 @@
 # -*- 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 += ['public', 'src']
-
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini',
-]
-
-MOCHITEST_CHROME_MANIFESTS += [
-    'test/chrome/chrome.ini',
-]
-
-MOCHITEST_MANIFESTS += [
-    'test/mochitest.ini'
-]
+TEST_DIRS += ['test']
new file mode 100644
--- /dev/null
+++ b/browser/components/feeds/test/chrome/Makefile.in
@@ -0,0 +1,10 @@
+#
+# 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/.
+
+# sample_feed.atom was copied from toolkit/components/places/tests/chrome
+MOCHITEST_FILES	= \
+		sample_feed.atom \
+		$(NULL)
+
--- a/browser/components/feeds/test/chrome/chrome.ini
+++ b/browser/components/feeds/test/chrome/chrome.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
-support-files = sample_feed.atom
 
 [test_423060.xul]
 [test_bug368464.html]
 [test_bug408328.html]
 [test_maxSniffing.html]
new file mode 100644
--- /dev/null
+++ b/browser/components/feeds/test/chrome/moz.build
@@ -0,0 +1,8 @@
+# -*- 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']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/feeds/test/moz.build
@@ -0,0 +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/.
+
+DIRS += ['chrome']
+
+MODULE = 'test_browser_feeds'
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+MOCHITEST_MANIFESTS += ['mochitest.ini']
+
--- a/browser/components/migration/moz.build
+++ b/browser/components/migration/moz.build
@@ -1,11 +1,8 @@
 # -*- 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 += ['public', 'src']
-
-XPCSHELL_TESTS_MANIFESTS += [
-    'tests/unit/xpcshell.ini',
-]
+TEST_DIRS += ['tests']
new file mode 100644
--- /dev/null
+++ b/browser/components/migration/tests/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -16,16 +16,20 @@ PARALLEL_DIRS += [
     'search',
     'sessionstore',
     'shell',
     'sidebar',
     'tabview',
     'migration',
 ]
 
+if CONFIG['MOZ_SAFE_BROWSING']:
+    PARALLEL_DIRS += ['safebrowsing']
+
+TEST_DIRS += ['test']
 DIRS += ['build']
 
 XPIDL_SOURCES += [
     'nsIBrowserGlue.idl',
     'nsIBrowserHandler.idl',
 ]
 
 XPIDL_MODULE = 'browsercompsbase'
@@ -39,15 +43,8 @@ EXTRA_PP_COMPONENTS += [
     'nsBrowserContentHandler.js',
     'nsBrowserGlue.js',
 ]
 
 EXTRA_JS_MODULES += [
     'distribution.js',
 ]
 
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini'
-]
-
-if CONFIG['MOZ_SAFE_BROWSING']:
-    BROWSER_CHROME_MANIFESTS += ['safebrowsing/content/test/browser.ini']
-
--- a/browser/components/places/moz.build
+++ b/browser/components/places/moz.build
@@ -1,19 +1,9 @@
 # -*- 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 += ['src']
-
-XPCSHELL_TESTS_MANIFESTS += [
-    'tests/unit/xpcshell.ini',
-]
+TEST_DIRS += ['tests']
 
-MOCHITEST_CHROME_MANIFESTS += [
-    'tests/chrome/chrome.ini'
-]
-
-BROWSER_CHROME_MANIFESTS += [
-    'tests/browser/browser.ini',
-]
new file mode 100644
--- /dev/null
+++ b/browser/components/places/tests/browser/Makefile.in
@@ -0,0 +1,38 @@
+# 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 = \
+	head.js \
+	browser_0_library_left_pane_migration.js \
+	browser_library_left_pane_fixnames.js \
+	browser_425884.js \
+	browser_475045.js \
+	browser_423515.js \
+	browser_410196_paste_into_tags.js \
+	browser_sort_in_library.js \
+	browser_library_open_leak.js \
+	browser_library_panel_leak.js \
+	browser_library_search.js \
+	browser_history_sidebar_search.js \
+	browser_bookmarksProperties.js \
+	$(filter disabled-for-very-frequent-oranges--bug-551540, browser_forgetthissite_single.js) \
+	browser_library_left_pane_commands.js \
+	browser_drag_bookmarks_on_toolbar.js \
+	browser_library_middleclick.js \
+	browser_library_views_liveupdate.js \
+	browser_views_liveupdate.js \
+	$(filter temporarily-disabled-for-breaking-the-treeview--bug-658744, browser_sidebarpanels_click.js) \
+	sidebarpanels_click_test_page.html \
+	browser_library_infoBox.js \
+	browser_markPageAsFollowedLink.js \
+	framedPage.html \
+	frameLeft.html \
+	frameRight.html \
+	browser_toolbar_migration.js \
+	browser_library_batch_delete.js \
+	browser_555547.js \
+	browser_416459_cut.js \
+	browser_library_downloads.js \
+	browser_library_left_pane_select_hierarchy.js \
+	$(NULL)
deleted file mode 100644
--- a/browser/components/places/tests/browser/browser.ini
+++ /dev/null
@@ -1,47 +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/.
-
-[DEFAULT]
-support-files =
-  head.js
-  framedPage.html
-  frameLeft.html
-  frameRight.html
-  sidebarpanels_click_test_page.html
-
-[browser_0_library_left_pane_migration.js]
-[browser_library_left_pane_fixnames.js]
-[browser_425884.js]
-[browser_475045.js]
-[browser_423515.js]
-[browser_410196_paste_into_tags.js]
-[browser_sort_in_library.js]
-[browser_library_open_leak.js]
-[browser_library_panel_leak.js]
-[browser_library_search.js]
-[browser_history_sidebar_search.js]
-[browser_bookmarksProperties.js]
-
-[browser_forgetthissite_single.js]
-# disabled for very frequent oranges - bug 551540
-skip-if = true
-
-[browser_library_left_pane_commands.js]
-[browser_drag_bookmarks_on_toolbar.js]
-[browser_library_middleclick.js]
-[browser_library_views_liveupdate.js]
-[browser_views_liveupdate.js]
-
-[browser_sidebarpanels_click.js]
-# temporarily disabled for breaking the treeview - bug 658744
-skip-if = true
-
-[browser_library_infoBox.js]
-[browser_markPageAsFollowedLink.js]
-[browser_toolbar_migration.js]
-[browser_library_batch_delete.js]
-[browser_555547.js]
-[browser_416459_cut.js]
-[browser_library_downloads.js]
-[browser_library_left_pane_select_hierarchy.js]
new file mode 100644
--- /dev/null
+++ b/browser/components/places/tests/browser/moz.build
@@ -0,0 +1,6 @@
+# -*- 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/.
+
new file mode 100644
--- /dev/null
+++ b/browser/components/places/tests/chrome/moz.build
@@ -0,0 +1,8 @@
+# -*- 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']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/places/tests/moz.build
@@ -0,0 +1,11 @@
+# -*- 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 += ['browser', 'chrome']
+
+MODULE = 'test_browser_places'
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
--- a/browser/components/preferences/in-content/moz.build
+++ b/browser/components/preferences/in-content/moz.build
@@ -1,6 +1,7 @@
 # -*- 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 += ['tests']
new file mode 100644
--- /dev/null
+++ b/browser/components/preferences/in-content/tests/moz.build
@@ -0,0 +1,8 @@
+# -*- 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']
+
--- a/browser/components/preferences/moz.build
+++ b/browser/components/preferences/moz.build
@@ -1,12 +1,8 @@
 # -*- 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/.
 
 PARALLEL_DIRS += ['in-content']
-
-BROWSER_CHROME_MANIFESTS += [
-    'in-content/tests/browser.ini',
-    'tests/browser.ini',
-]
+TEST_DIRS += ['tests']
new file mode 100644
--- /dev/null
+++ b/browser/components/preferences/tests/moz.build
@@ -0,0 +1,8 @@
+# -*- 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']
+
--- a/browser/components/privatebrowsing/moz.build
+++ b/browser/components/privatebrowsing/moz.build
@@ -1,9 +1,10 @@
 # -*- 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 += [
-    'test/browser/browser.ini',
-]
+TEST_DIRS += ['test']
+
+MODULE = 'privatebrowsing'
+
new file mode 100644
--- /dev/null
+++ b/browser/components/privatebrowsing/test/browser/moz.build
@@ -0,0 +1,10 @@
+# -*- 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/.
+
+MODULE = 'test_privatebrowsing'
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/privatebrowsing/test/moz.build
@@ -0,0 +1,10 @@
+# -*- 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 += ['browser']
+
+MODULE = 'test_privatebrowsing'
+
new file mode 100644
--- /dev/null
+++ b/browser/components/safebrowsing/content/test/moz.build
@@ -0,0 +1,8 @@
+# -*- 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']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/safebrowsing/moz.build
@@ -0,0 +1,8 @@
+# -*- 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 += ['content/test']
+
--- a/browser/components/search/moz.build
+++ b/browser/components/search/moz.build
@@ -1,9 +1,7 @@
 # -*- 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 += [
-    'test/browser.ini',
-]
+TEST_DIRS += ['test']
new file mode 100644
--- /dev/null
+++ b/browser/components/search/test/moz.build
@@ -0,0 +1,8 @@
+# -*- 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']
+
--- a/browser/components/sessionstore/moz.build
+++ b/browser/components/sessionstore/moz.build
@@ -1,22 +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 += ['src']
+TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsISessionStartup.idl',
     'nsISessionStore.idl',
 ]
 
 MODULE = 'sessionstore'
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini',
-]
-
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini',
-]
new file mode 100644
--- /dev/null
+++ b/browser/components/sessionstore/test/Makefile.in
@@ -0,0 +1,165 @@
+# 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_506482.js is disabled because of frequent failures (bug 538672)
+# browser_526613.js is disabled because of frequent failures (bug 534489)
+# browser_589246.js is disabled for leaking browser windows (bug 752467)
+# browser_580512.js is disabled for leaking browser windows (bug 752467)
+
+MOCHITEST_BROWSER_FILES = \
+	head.js \
+	browser_attributes.js \
+	browser_capabilities.js \
+	browser_dying_cache.js \
+	browser_form_restore_events.js \
+	browser_form_restore_events_sample.html \
+	browser_formdata_format.js \
+	browser_formdata_format_sample.html \
+	browser_input.js \
+	browser_input_sample.html \
+	browser_pageshow.js \
+	browser_sessionStorage.js \
+	browser_tabStateCache.js \
+	browser_upgrade_backup.js \
+	browser_windowRestore_perwindowpb.js \
+	browser_248970_b_perwindowpb.js \
+	browser_248970_b_sample.html \
+	browser_339445.js \
+	browser_339445_sample.html \
+	browser_345898.js \
+	browser_346337.js \
+	browser_346337_sample.html \
+	browser_350525.js \
+	browser_354894_perwindowpb.js \
+	browser_367052.js \
+	browser_393716.js \
+	browser_394759_basic.js \
+	browser_394759_behavior.js \
+	browser_394759_perwindowpb.js \
+	browser_394759_purge.js \
+	browser_408470.js \
+	browser_408470_sample.html \
+	browser_423132.js \
+	browser_423132_sample.html \
+	browser_447951.js \
+	browser_447951_sample.html \
+	browser_448741.js \
+	browser_454908.js \
+	browser_454908_sample.html \
+	browser_456342.js \
+	browser_456342_sample.xhtml \
+	browser_461634.js \
+	browser_463205.js \
+	browser_463205_helper.html \
+	browser_463205_sample.html \
+	browser_463206.js \
+	browser_463206_sample.html \
+	browser_464199.js \
+	browser_465215.js \
+	browser_465223.js \
+	browser_466937.js \
+	browser_466937_sample.html \
+	browser_467409-backslashplosion.js \
+	browser_477657.js \
+	browser_480148.js \
+	browser_480893.js \
+	browser_483330.js \
+	browser_485482.js \
+	browser_485482_sample.html \
+	browser_485563.js \
+	browser_490040.js \
+	browser_491168.js \
+	browser_491577.js \
+	browser_495495.js \
+	browser_500328.js \
+	browser_514751.js \
+	browser_522375.js \
+	browser_522545.js \
+	browser_524745.js \
+	browser_528776.js \
+	browser_579868.js \
+	browser_579879.js \
+	browser_581593.js \
+	browser_581937.js \
+	browser_586147.js \
+	browser_586068-apptabs.js \
+	browser_586068-apptabs_ondemand.js \
+	browser_586068-browser_state_interrupted.js \
+	browser_586068-cascade.js \
+	browser_586068-multi_window.js \
+	browser_586068-reload.js \
+	browser_586068-select.js \
+	browser_586068-window_state.js \
+	browser_586068-window_state_override.js \
+	browser_588426.js \
+	browser_590268.js \
+	browser_590563.js \
+	browser_595601-restore_hidden.js \
+	browser_597315.js \
+	browser_597315_index.html \
+	browser_597315_a.html \
+	browser_597315_b.html \
+	browser_597315_c.html \
+	browser_597315_c1.html \
+	browser_597315_c2.html \
+	browser_599909.js \
+	browser_600545.js \
+	browser_601955.js \
+	browser_607016.js \
+	browser_615394-SSWindowState_events.js \
+	browser_618151.js \
+	browser_623779.js \
+	browser_624727.js \
+	browser_625257.js \
+	browser_628270.js \
+	browser_635418.js \
+	browser_636279.js \
+	browser_637020.js \
+	browser_637020_slow.sjs \
+	browser_644409-scratchpads.js \
+	browser_645428.js \
+	browser_659591.js \
+	browser_662743.js \
+	browser_662743_sample.html \
+	browser_662812.js \
+	browser_665702-state_session.js \
+	browser_682507.js \
+	browser_687710.js \
+	browser_687710_2.js \
+	browser_694378.js \
+	browser_701377.js \
+	browser_705597.js \
+	browser_707862.js \
+	browser_739531.js \
+	browser_739531_sample.html \
+	browser_739805.js \
+	browser_819510_perwindowpb.js \
+	browser_833286_atomic_backup.js \
+	browser_916390_form_data_loss.js \
+	browser_916390_sample.html \
+	$(filter disabled-for-intermittent-failures--bug-766044, browser_459906_empty.html) \
+	$(filter disabled-for-intermittent-failures--bug-766044, browser_459906_sample.html) \
+	$(filter disabled-for-intermittent-failures--bug-765389, browser_461743_sample.html) \
+	$(NULL)
+
+# Disabled on Windows for frequent intermittent failures
+ifneq ($(OS_ARCH), WINNT)
+MOCHITEST_FILES += \
+	browser_464620_a.js \
+	browser_464620_a.html \
+	browser_464620_b.js \
+	browser_464620_b.html \
+	browser_464620_xd.html \
+	$(NULL)
+else
+$(filter disabled-for-intermittent-failures-on-windows--bug-552424, browser_464620_a.js)
+$(filter disabled-for-intermittent-failures-on-windows--bug-552424, browser_464620_b.js)
+endif
+
+ifneq ($(OS_ARCH),Darwin)
+MOCHITEST_BROWSER_FILES += \
+	browser_597071.js \
+	browser_625016.js \
+	$(NULL)
+endif
deleted file mode 100644
--- a/browser/components/sessionstore/test/browser.ini
+++ /dev/null
@@ -1,164 +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/.
-
-# browser_506482.js is disabled because of frequent failures (bug 538672)
-# browser_526613.js is disabled because of frequent failures (bug 534489)
-# browser_589246.js is disabled for leaking browser windows (bug 752467)
-# browser_580512.js is disabled for leaking browser windows (bug 752467)
-
-[DEFAULT]
-support-files =
-  head.js
-  browser_form_restore_events_sample.html
-  browser_formdata_format_sample.html
-  browser_input_sample.html
-  browser_248970_b_sample.html
-  browser_339445_sample.html
-  browser_346337_sample.html
-  browser_408470_sample.html
-  browser_423132_sample.html
-  browser_447951_sample.html
-  browser_454908_sample.html
-  browser_456342_sample.xhtml
-  browser_463205_helper.html
-  browser_463205_sample.html
-  browser_463206_sample.html
-  browser_466937_sample.html
-  browser_485482_sample.html
-  browser_597315_index.html
-  browser_597315_a.html
-  browser_597315_b.html
-  browser_597315_c.html
-  browser_597315_c1.html
-  browser_597315_c2.html
-  browser_662743_sample.html
-  browser_739531_sample.html
-  browser_916390_sample.html
-#NB: the following are disabled on Windows:
-  browser_464620_a.html
-  browser_464620_b.html 
-  browser_464620_xd.html
-
-
-#disabled-for-intermittent-failures--bug-766044, browser_459906_empty.html
-#disabled-for-intermittent-failures--bug-766044, browser_459906_sample.html
-#disabled-for-intermittent-failures--bug-765389, browser_461743_sample.html
-
-[browser_attributes.js]
-[browser_capabilities.js]
-[browser_dying_cache.js]
-[browser_form_restore_events.js]
-[browser_formdata_format.js]
-[browser_input.js]
-[browser_pageshow.js]
-[browser_sessionStorage.js]
-[browser_tabStateCache.js]
-[browser_upgrade_backup.js]
-[browser_windowRestore_perwindowpb.js]
-[browser_248970_b_perwindowpb.js]
-[browser_339445.js]
-[browser_345898.js]
-[browser_346337.js]
-[browser_350525.js]
-[browser_354894_perwindowpb.js]
-[browser_367052.js]
-[browser_393716.js]
-[browser_394759_basic.js]
-[browser_394759_behavior.js]
-[browser_394759_perwindowpb.js]
-[browser_394759_purge.js]
-[browser_408470.js]
-[browser_423132.js]
-[browser_447951.js]
-[browser_448741.js]
-[browser_454908.js]
-[browser_456342.js]
-[browser_461634.js]
-[browser_463205.js]
-[browser_463206.js]
-[browser_464199.js]
-[browser_465215.js]
-[browser_465223.js]
-[browser_466937.js]
-[browser_467409-backslashplosion.js]
-[browser_477657.js]
-[browser_480148.js]
-[browser_480893.js]
-[browser_483330.js]
-[browser_485482.js]
-[browser_485563.js]
-[browser_490040.js]
-[browser_491168.js]
-[browser_491577.js]
-[browser_495495.js]
-[browser_500328.js]
-[browser_514751.js]
-[browser_522375.js]
-[browser_522545.js]
-[browser_524745.js]
-[browser_528776.js]
-[browser_579868.js]
-[browser_579879.js]
-[browser_581593.js]
-[browser_581937.js]
-[browser_586147.js]
-[browser_586068-apptabs.js]
-[browser_586068-apptabs_ondemand.js]
-[browser_586068-browser_state_interrupted.js]
-[browser_586068-cascade.js]
-[browser_586068-multi_window.js]
-[browser_586068-reload.js]
-[browser_586068-select.js]
-[browser_586068-window_state.js]
-[browser_586068-window_state_override.js]
-[browser_588426.js]
-[browser_590268.js]
-[browser_590563.js]
-[browser_595601-restore_hidden.js]
-[browser_597315.js]
-[browser_599909.js]
-[browser_600545.js]
-[browser_601955.js]
-[browser_607016.js]
-[browser_615394-SSWindowState_events.js]
-[browser_618151.js]
-[browser_623779.js]
-[browser_624727.js]
-[browser_625257.js]
-[browser_628270.js]
-[browser_635418.js]
-[browser_636279.js]
-[browser_637020.js]
-[browser_637020_slow.sjs]
-[browser_644409-scratchpads.js]
-[browser_645428.js]
-[browser_659591.js]
-[browser_662743.js]
-[browser_662812.js]
-[browser_665702-state_session.js]
-[browser_682507.js]
-[browser_687710.js]
-[browser_687710_2.js]
-[browser_694378.js]
-[browser_701377.js]
-[browser_705597.js]
-[browser_707862.js]
-[browser_739531.js]
-[browser_739805.js]
-[browser_819510_perwindowpb.js]
-[browser_833286_atomic_backup.js]
-[browser_916390_form_data_loss.js]
-
-# Disabled on Windows for frequent intermittent failures
-[browser_464620_a.js]
-skip-if = os == "win"
-[browser_464620_b.js]
-skip-if = os == "win"
-
-# Disabled on OS X:
-[browser_597071.js]
-skip-if = os == "mac"
-[browser_625016.js]
-skip-if = os == "mac"
-
new file mode 100644
--- /dev/null
+++ b/browser/components/sessionstore/test/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
--- a/browser/components/shell/moz.build
+++ b/browser/components/shell/moz.build
@@ -1,15 +1,8 @@
 # -*- 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 += ['public', 'src']
-
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini'
-]
-
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini',
-]
+TEST_DIRS += ['test']
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/test/moz.build
@@ -0,0 +1,12 @@
+# -*- 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/.
+
+MODULE = 'test_browser_shell'
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/tabview/Makefile.in
@@ -0,0 +1,9 @@
+#
+# 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/.
+
+include $(topsrcdir)/config/rules.mk
+
+libs::
+	$(NSINSTALL) $(srcdir)/modules/* $(FINAL_TARGET)/modules/tabview
--- a/browser/components/tabview/moz.build
+++ b/browser/components/tabview/moz.build
@@ -1,12 +1,7 @@
 # -*- 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/.
 
-EXTRA_JS_MODULES = ['modules/utils.jsm']
-JS_MODULES_PATH  = 'modules/tabview'
-
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini',
-]
+TEST_DIRS += ['test']
new file mode 100644
--- /dev/null
+++ b/browser/components/tabview/test/moz.build
@@ -0,0 +1,8 @@
+# -*- 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']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/test/moz.build
@@ -0,0 +1,8 @@
+# -*- 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']
+