Bug 956862 - Move some mochitests to manifests; r=mshal
authorMs2ger <ms2ger@gmail.com>
Mon, 20 Jan 2014 08:58:27 +0100
changeset 164249 f2d8bb102e05b307d7cb85eaae66ebdab84119ad
parent 164248 99fcc73aad53fd3f81e6c44c44047ae6467ce67e
child 164271 01ec0095e6553d7fedf21c6e8b72861b057850b4
push id26031
push userMs2ger@gmail.com
push dateMon, 20 Jan 2014 08:08:21 +0000
treeherderautoland@f2d8bb102e05 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs956862
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 956862 - Move some mochitests to manifests; r=mshal
content/html/content/test/bug649134/Makefile.in
content/html/content/test/bug649134/moz.build
content/html/content/test/forms/moz.build
content/html/content/test/mochitest.ini
content/html/content/test/moz.build
docshell/test/Makefile.in
docshell/test/browser/moz.build
docshell/test/mochitest.ini
docshell/test/moz.build
dom/browser-element/mochitest/moz.build
dom/browser-element/mochitest/priority/Makefile.in
dom/browser-element/mochitest/priority/mochitest.ini
dom/browser-element/mochitest/priority/moz.build
dom/media/tests/mochitest/Makefile.in
extensions/spellcheck/moz.build
extensions/spellcheck/tests/chrome/base/Makefile.in
extensions/spellcheck/tests/chrome/base/moz.build
extensions/spellcheck/tests/chrome/chrome.ini
extensions/spellcheck/tests/chrome/map/Makefile.in
extensions/spellcheck/tests/chrome/map/moz.build
extensions/spellcheck/tests/chrome/moz.build
toolkit/components/passwordmgr/test/Makefile.in
toolkit/components/passwordmgr/test/auth2/Makefile.in
toolkit/components/passwordmgr/test/auth2/moz.build
toolkit/components/passwordmgr/test/browser/moz.build
toolkit/components/passwordmgr/test/mochitest.ini
toolkit/components/passwordmgr/test/moz.build
toolkit/components/perf/Makefile.in
toolkit/components/perf/chrome.ini
toolkit/components/perf/moz.build
toolkit/content/tests/browser/browser.ini
toolkit/content/tests/browser/common/Makefile.in
toolkit/content/tests/browser/common/moz.build
toolkit/content/tests/browser/data/Makefile.in
toolkit/content/tests/browser/data/moz.build
toolkit/content/tests/browser/moz.build
toolkit/content/tests/chrome/chrome.ini
toolkit/content/tests/chrome/moz.build
toolkit/content/tests/chrome/rtlchrome/Makefile.in
toolkit/content/tests/chrome/rtlchrome/moz.build
toolkit/content/tests/chrome/rtltest/Makefile.in
toolkit/content/tests/chrome/rtltest/content/Makefile.in
toolkit/content/tests/chrome/rtltest/content/moz.build
toolkit/content/tests/chrome/rtltest/moz.build
toolkit/content/tests/moz.build
deleted file mode 100644
--- a/content/html/content/test/bug649134/Makefile.in
+++ /dev/null
@@ -1,6 +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 = file_bug649134-1.sjs file_bug649134-2.sjs index.html
deleted file mode 100644
--- a/content/html/content/test/bug649134/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/content/html/content/test/forms/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_MANIFESTS += ['mochitest.ini']
-
--- a/content/html/content/test/mochitest.ini
+++ b/content/html/content/test/mochitest.ini
@@ -320,16 +320,26 @@ support-files =
 [test_bug6296.html]
 [test_bug629801.html]
 [test_bug633058.html]
 [test_bug636336.html]
 [test_bug641219.html]
 [test_bug643051.html]
 [test_bug646157.html]
 [test_bug649134.html]
+# This extra subdirectory is needed due to the nature of this test.
+# With the bug, the test loads the base URL of the bug649134/file_*.sjs
+# files, and the mochitest server responds with the contents of index.html if
+# it exists in that case, which we use to detect failure.
+# We cannot have index.html in this directory because it would prevent
+# running the tests here.
+support-files =
+  bug649134/file_bug649134-1.sjs
+  bug649134/file_bug649134-2.sjs
+  bug649134/index.html
 [test_bug651956.html]
 [test_bug658746.html]
 [test_bug659596.html]
 [test_bug659743.xml]
 [test_bug660663.html]
 [test_bug660959-1.html]
 [test_bug660959-2.html]
 [test_bug660959-3.html]
--- a/content/html/content/test/moz.build
+++ b/content/html/content/test/moz.build
@@ -1,22 +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/.
 
-# This extra subdirectory is needed due to the nature of this test.
-# With the bug, the test loads the base URL of the bug649134/file_*.sjs
-# files, and the mochitest server responds with the contents of index.html if
-# it exists in that case, which we use to detect failure.
-# We can't have index.html in this directory because it would prevent
-# running the tests here.
-TEST_DIRS += ['bug649134']
-
-TEST_DIRS += ['forms']
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
+MOCHITEST_MANIFESTS += ['forms/mochitest.ini', 'mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
 BROWSER_CHROME_MANIFESTS += ['browser.ini']
 
deleted file mode 100644
--- a/docshell/test/Makefile.in
+++ /dev/null
@@ -1,14 +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/.
-
-# Disabled for too many intermittent failures (bug 719186)
-#		test_bug413310.html \
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-MOCHITEST_FILES += \
-		test_bug511449.html \
-		file_bug511449.html \
-		$(NULL)
-endif
deleted file mode 100644
--- a/docshell/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']
-
--- a/docshell/test/mochitest.ini
+++ b/docshell/test/mochitest.ini
@@ -39,18 +39,24 @@ support-files =
 [test_bfcache_plus_hash.html]
 [test_bug123696.html]
 [test_bug369814.html]
 [test_bug384014.html]
 [test_bug385434.html]
 [test_bug387979.html]
 [test_bug402210.html]
 [test_bug404548.html]
+[test_bug413310.html]
+# Disabled for too many intermittent failures (bug 719186)
+skip-if = true
 [test_bug475636.html]
 [test_bug509055.html]
+[test_bug511449.html]
+skip-if = toolkit != "cocoa"
+support-files = file_bug511449.html
 [test_bug529119-1.html]
 [test_bug529119-2.html]
 [test_bug540462.html]
 [test_bug551225.html]
 [test_bug570341.html]
 [test_bug580069.html]
 [test_bug590573.html]
 [test_bug598895.html]
--- a/docshell/test/moz.build
+++ b/docshell/test/moz.build
@@ -1,18 +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/.
 
-DIRS += ['chrome', 'navigation', 'browser']
+DIRS += ['chrome', 'navigation']
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 if CONFIG['OS_ARCH'] != 'Darwin':
     XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
 
 MOCHITEST_MANIFESTS += [
     'iframesandbox/mochitest.ini',
     'mochitest.ini'
 ]
+BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
+
--- a/dom/browser-element/mochitest/moz.build
+++ b/dom/browser-element/mochitest/moz.build
@@ -1,7 +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/.
 
-DIRS = ['priority']
+MOCHITEST_MANIFESTS += ['priority/mochitest.ini']
deleted file mode 100644
--- a/dom/browser-element/mochitest/priority/Makefile.in
+++ /dev/null
@@ -1,39 +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 makes all tests in this directory OOP,
-# because testing the process-priority manager without OOP frames doesn't make
-# much sense.
-#
-# Good luck running these tests on anything but desktop Linux.
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-
-# This test disabled due to bug 865844.  In fact, it was never enabled!
-#
-#       test_WebGLContextLost.html \
-#       file_WebGLContextLost.html \
-
-MOCHITEST_FILES = \
-	test_Simple.html \
-	test_Visibility.html \
-	test_HighPriority.html \
-	file_HighPriority.html \
-	test_HighPriorityDowngrade.html \
-	test_HighPriorityDowngrade2.html \
-	test_Background.html \
-	test_BackgroundLRU.html \
-	test_Audio.html \
-	file_Audio.html \
-	silence.ogg \
-	test_MultipleFrames.html \
-	file_MultipleFrames.html \
-	test_Preallocated.html \
-	test_ExpectingSystemMessage.html \
-	test_ExpectingSystemMessage2.html \
-	test_NestedFrames.html \
-	file_NestedFramesOuter.html \
-	$(NULL)
-
-endif # MOZ_WIDGET_TOOLKIT == gtk2
new file mode 100644
--- /dev/null
+++ b/dom/browser-element/mochitest/priority/mochitest.ini
@@ -0,0 +1,30 @@
+[DEFAULT]
+# Good luck running these tests on anything but desktop Linux.
+skip-if = toolkit != "gtk2"
+
+# Note: ../browserElementTestHelpers.js makes all tests in this directory OOP,
+# because testing the process-priority manager without OOP frames does not make
+# much sense.
+
+[test_Simple.html]
+[test_Visibility.html]
+[test_HighPriority.html]
+support-files = file_HighPriority.html
+[test_HighPriorityDowngrade.html]
+[test_HighPriorityDowngrade2.html]
+[test_Background.html]
+[test_BackgroundLRU.html]
+[test_Audio.html]
+support-files = file_Audio.html silence.ogg
+[test_MultipleFrames.html]
+support-files = file_MultipleFrames.html
+[test_Preallocated.html]
+[test_ExpectingSystemMessage.html]
+[test_ExpectingSystemMessage2.html]
+[test_NestedFrames.html]
+support-files = file_NestedFramesOuter.html
+[test_WebGLContextLost.html]
+# This test disabled due to bug 865844.  In fact, it was never enabled!
+skip-if = true
+support-files = file_WebGLContextLost.html
+
deleted file mode 100644
deleted file mode 100644
--- a/dom/media/tests/mochitest/Makefile.in
+++ /dev/null
@@ -1,9 +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/.
-
-# The following tests are leaking and cannot be run by default yet
-ifdef MOZ_WEBRTC_LEAKING_TESTS
-MOCHITEST_FILES += \
-  $(NULL)
-endif
--- a/extensions/spellcheck/moz.build
+++ b/extensions/spellcheck/moz.build
@@ -1,9 +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 += ['idl', 'locales', 'hunspell', 'src']
-TEST_DIRS += ['tests/chrome']
 
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
deleted file mode 100644
--- a/extensions/spellcheck/tests/chrome/base/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_CHROME_FILES = 	base_utf.dic \
-				base_utf.aff \
-				$(NULL)
deleted file mode 100644
--- a/extensions/spellcheck/tests/chrome/base/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/extensions/spellcheck/tests/chrome/chrome.ini
+++ b/extensions/spellcheck/tests/chrome/chrome.ini
@@ -1,3 +1,8 @@
 [DEFAULT]
 
 [test_add_remove_dictionaries.xul]
+support-files =
+  base/base_utf.dic
+  base/base_utf.aff
+  map/maputf.dic
+  map/maputf.aff
deleted file mode 100644
--- a/extensions/spellcheck/tests/chrome/map/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_CHROME_FILES = 	maputf.dic \
-				maputf.aff \
-				$(NULL)
deleted file mode 100644
--- a/extensions/spellcheck/tests/chrome/map/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/extensions/spellcheck/tests/chrome/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/.
-
-DIRS += ['base', 'map']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
deleted file mode 100644
--- a/toolkit/components/passwordmgr/test/Makefile.in
+++ /dev/null
@@ -1,17 +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/.
-
-include $(topsrcdir)/config/config.mk
-
-# Mochitest tests
-ifneq ($(OS_TARGET),Linux)
-MOCHITEST_FILES += \
-    test_prompt.html \
-    $(NULL)
-endif
-
-# This test doesn't pass because we can't ensure a cross-platform
-# event that occurs between DOMContentLoaded and Pageload
-# test_bug_221634.html
deleted file mode 100644
--- a/toolkit/components/passwordmgr/test/auth2/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 = \
-    authenticate.sjs \
-		$(NULL)
deleted file mode 100644
--- a/toolkit/components/passwordmgr/test/auth2/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/toolkit/components/passwordmgr/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']
-
--- a/toolkit/components/passwordmgr/test/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest.ini
@@ -19,32 +19,37 @@ support-files =
   subtst_notifications_7.html
   subtst_notifications_8.html
   subtst_notifications_9.html
   subtst_privbrowsing_1.html
   subtst_privbrowsing_2.html
   subtst_privbrowsing_3.html
   subtst_privbrowsing_4.html
   subtst_prompt_async.html
+  auth2/authenticate.sjs
 
 [test_basic_form.html]
 [test_basic_form_0pw.html]
 [test_basic_form_1pw.html]
 [test_basic_form_1pw_2.html]
 [test_basic_form_2.html]
 [test_basic_form_2pw_1.html]
 [test_basic_form_2pw_2.html]
 [test_basic_form_3pw_1.html]
 [test_basic_form_autocomplete.html]
 [test_basic_form_html5.html]
 [test_basic_form_observer_autocomplete.html]
 [test_basic_form_observer_autofillForms.html]
 [test_basic_form_observer_foundLogins.html]
 [test_basic_form_pwevent.html]
 [test_basic_form_pwonly.html]
+[test_bug_221634.html]
+# This test doesn't pass because we can't ensure a cross-platform event that
+# occurs between DOMContentLoaded and Pageload
+skip-if = true
 [test_bug_227640.html]
 [test_bug_242956.html]
 [test_bug_360493_1.html]
 [test_bug_360493_2.html]
 [test_bug_391514.html]
 [test_bug_427033.html]
 [test_bug_444968.html]
 [test_bug_627616.html]
@@ -52,12 +57,14 @@ support-files =
 [test_bug_776171.html]
 [test_master_password.html]
 # Bug 917797 - too many intermittent failures
 skip-if = true
 [test_master_password_cleanup.html]
 [test_notifications.html]
 [test_notifications_popup.html]
 skip-if = os == "linux" # bug 934057
+[test_prompt.html]
+skip-if = os == "linux"
 [test_prompt_async.html]
 [test_xhr.html]
 [test_xml_load.html]
 [test_zzz_finish.html]
--- a/toolkit/components/passwordmgr/test/moz.build
+++ b/toolkit/components/passwordmgr/test/moz.build
@@ -1,14 +1,13 @@
 # -*- 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 += ['browser', 'auth2']
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
+BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
deleted file mode 100644
--- a/toolkit/components/perf/Makefile.in
+++ /dev/null
@@ -1,13 +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/.
-
-LOCAL_INCLUDES := \
-  -I$(topsrcdir)/js/xpconnect/loader \
-  $(NULL)
-
-ifdef ENABLE_TESTS
-MOCHITEST_CHROME_FILES = \
-    test_pm.xul \
-    $(NULL)
-endif
new file mode 100644
--- /dev/null
+++ b/toolkit/components/perf/chrome.ini
@@ -0,0 +1,3 @@
+[DEFAULT]
+
+[test_pm.xul]
--- a/toolkit/components/perf/moz.build
+++ b/toolkit/components/perf/moz.build
@@ -10,8 +10,14 @@ SOURCES += [
 
 EXTRA_JS_MODULES += [
     'PerfMeasurement.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '/js/xpconnect/loader',
+]
+
+MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
--- a/toolkit/content/tests/browser/browser.ini
+++ b/toolkit/content/tests/browser/browser.ini
@@ -3,8 +3,12 @@
 [browser_browserDrop.js]
 [browser_bug295977_autoscroll_overflow.js]
 [browser_bug594509.js]
 [browser_default_image_filename.js]
 [browser_findbar.js]
 [browser_input_file_tooltips.js]
 [browser_keyevents_during_autoscrolling.js]
 [browser_save_resend_postdata.js]
+support-files =
+  common/mockTransfer.js
+  data/post_form_inner.sjs
+  data/post_form_outer.sjs
deleted file mode 100644
--- a/toolkit/content/tests/browser/common/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_BROWSER_FILES = \
-  mockTransfer.js \
-  $(NULL)
deleted file mode 100644
--- a/toolkit/content/tests/browser/common/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/toolkit/content/tests/browser/data/Makefile.in
+++ /dev/null
@@ -1,9 +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 = \
-  post_form_inner.sjs \
-  post_form_outer.sjs \
-  $(NULL)
deleted file mode 100644
--- a/toolkit/content/tests/browser/data/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/toolkit/content/tests/browser/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/.
-
-DIRS += ['common', 'data']
-
-BROWSER_CHROME_MANIFESTS += ['browser.ini']
-
--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@@ -35,16 +35,21 @@ support-files =
   window_preferences2.xul
   window_preferences3.xul
   window_preferences_commandretarget.xul
   window_screenPosSize.xul
   window_showcaret.xul
   window_subframe_origin.xul
   window_titlebar.xul
   xul_selectcontrol.js
+  rtlchrome/rtl.css
+  rtlchrome/rtl.dtd
+  rtlchrome/rtl.manifest
+  rtltest/righttoleft.manifest
+  rtltest/content/dirtest.xul
 
 [test_about_networking.html]
 [test_arrowpanel.xul]
 [test_autocomplete2.xul]
 [test_autocomplete3.xul]
 [test_autocomplete4.xul]
 [test_autocomplete5.xul]
 [test_autocomplete_delayOnPaste.xul]
--- a/toolkit/content/tests/chrome/moz.build
+++ b/toolkit/content/tests/chrome/moz.build
@@ -1,10 +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 += ['rtltest', 'rtlchrome']
-
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
deleted file mode 100644
--- a/toolkit/content/tests/chrome/rtlchrome/Makefile.in
+++ /dev/null
@@ -1,9 +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_CHROME_FILES := \
-  rtl.css \
-  rtl.dtd \
-  rtl.manifest \
-  $(NULL)
deleted file mode 100644
--- a/toolkit/content/tests/chrome/rtlchrome/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/toolkit/content/tests/chrome/rtltest/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_CHROME_FILES := \
-  righttoleft.manifest \
-  $(NULL)
deleted file mode 100644
--- a/toolkit/content/tests/chrome/rtltest/content/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_CHROME_FILES := \
-  dirtest.xul \
-  $(NULL)
deleted file mode 100644
--- a/toolkit/content/tests/chrome/rtltest/content/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/toolkit/content/tests/chrome/rtltest/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/.
-
-DIRS += [
-    'content',
-]
--- a/toolkit/content/tests/moz.build
+++ b/toolkit/content/tests/moz.build
@@ -1,9 +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 += ['chrome', 'widgets', 'browser']
+DIRS += ['chrome', 'widgets']
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']