Bug 996003 - Various devtools test manifest cleanups. r=miker

browser/devtools/app-manager/moz.build

@@ -4,4 +4,5 @@
 # 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_CHROME_MANIFESTS += ['test/browser.ini']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']

browser/devtools/app-manager/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   head.js
   hosted_app.manifest

browser/devtools/app-manager/test/moz.build

@@ -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']
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']

browser/devtools/canvasdebugger/moz.build

@@ -3,10 +3,10 @@
 # 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']
-
 JS_MODULES_PATH = 'modules/devtools/canvasdebugger'
 
 EXTRA_JS_MODULES += [
     'panel.js'
 ]
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/canvasdebugger/test/moz.build

@@ -1,6 +0,0 @@
-# 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']

browser/devtools/commandline/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   head.js
   helpers.js

browser/devtools/debugger/moz.build

@@ -11,4 +11,3 @@ EXTRA_JS_MODULES += [
 ]
 
 BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
-

browser/devtools/debugger/test/browser.ini

@@ -1,5 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
+subsuite = devtools
 support-files =
   addon1.xpi
   addon2.xpi

browser/devtools/eyedropper/moz.build

@@ -4,10 +4,10 @@
 # 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']
-
 JS_MODULES_PATH = 'modules/devtools/eyedropper'
 
 EXTRA_JS_MODULES += [
     'eyedropper.js'
 ]
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/eyedropper/test/browser.ini

@@ -1,5 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
+subsuite = devtools
 support-files =
   color-block.html
   head.js

browser/devtools/eyedropper/test/moz.build

@@ -1,6 +0,0 @@
-# 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']

browser/devtools/fontinspector/moz.build

@@ -4,4 +4,4 @@
 # 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_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/fontinspector/test/browser.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
+skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   browser_font.woff
   browser_fontinspector.html

browser/devtools/fontinspector/test/moz.build

@@ -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']
-

browser/devtools/framework/moz.build

@@ -4,4 +4,4 @@
 # 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_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/framework/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   browser_toolbox_options_disable_js.html
   browser_toolbox_options_disable_js_iframe.html

browser/devtools/framework/test/moz.build

@@ -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']
-

browser/devtools/inspector/moz.build

@@ -11,4 +11,4 @@ EXTRA_JS_MODULES += [
     'selector-search.js'
 ]
 
-TEST_DIRS += ['test']
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/inspector/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   browser_inspector_breadcrumbs.html
   browser_inspector_bug_650804_search.html

browser/devtools/inspector/test/moz.build

@@ -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']
-

browser/devtools/layoutview/moz.build

@@ -4,5 +4,5 @@
 # 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_CHROME_MANIFESTS += ['test/browser.ini']
 

browser/devtools/layoutview/test/browser.ini

@@ -1,7 +1,8 @@
 [DEFAULT]
+skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
+subsuite = devtools
 support-files =
   head.js
-subsuite = devtools
 
 [browser_layoutview.js]
 skip-if = true

browser/devtools/layoutview/test/moz.build

@@ -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']
-

browser/devtools/markupview/moz.build

@@ -4,4 +4,4 @@
 # 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_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/markupview/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   doc_markup_edit.html
   doc_markup_flashing.html

browser/devtools/markupview/test/moz.build

@@ -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']
-

browser/devtools/netmonitor/moz.build

@@ -3,10 +3,10 @@
 # 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']
-
 JS_MODULES_PATH = 'modules/devtools/netmonitor'
 
 EXTRA_JS_MODULES += [
     'panel.js'
 ]
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/netmonitor/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   head.js
   html_content-type-test-page.html

browser/devtools/netmonitor/test/moz.build

@@ -1,7 +0,0 @@
-# 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']
-

browser/devtools/profiler/moz.build

@@ -4,4 +4,4 @@
 # 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_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/profiler/test/browser.ini

@@ -1,8 +1,8 @@
 [DEFAULT]
+skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
+# Disabled globally due to crashes/timeouts on all platforms (bug 973974)
+skip-if = true # Overrides the e10s case above.
 subsuite = devtools
-
-# Crashes/timeouts on all platforms (bug 973974)
-skip-if = true
 support-files =
   head.js
   mock_console_api.html

browser/devtools/profiler/test/moz.build

@@ -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']
-

browser/devtools/responsivedesign/moz.build

@@ -8,4 +8,4 @@ EXTRA_JS_MODULES += [
     'resize-commands.js'
 ]
 
-TEST_DIRS += ['test']
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/responsivedesign/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   head.js
   touch.html

browser/devtools/responsivedesign/test/moz.build

@@ -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']
-

browser/devtools/scratchpad/moz.build

@@ -4,11 +4,11 @@
 # 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']
-
 JS_MODULES_PATH = 'modules/devtools/scratchpad'
 
 EXTRA_JS_MODULES += [
     'scratchpad-commands.js',
     'scratchpad-panel.js'
 ]
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/scratchpad/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files = head.js
 
 [browser_scratchpad_browser_last_window_closing.js]

browser/devtools/scratchpad/test/moz.build

@@ -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']
-

browser/devtools/shadereditor/moz.build

@@ -3,10 +3,10 @@
 # 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']
-
 JS_MODULES_PATH = 'modules/devtools/shadereditor'
 
 EXTRA_JS_MODULES += [
     'panel.js'
 ]
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/shadereditor/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   doc_blended-geometry.html
   doc_multiple-contexts.html

browser/devtools/shadereditor/test/moz.build

@@ -1,6 +0,0 @@
-# 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']

browser/devtools/shared/moz.build

@@ -4,4 +4,5 @@
 # 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_CHROME_MANIFESTS += ['test/browser.ini']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']

browser/devtools/shared/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   browser_layoutHelpers.html
   browser_layoutHelpers_iframe.html

browser/devtools/shared/test/moz.build

@@ -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/.
-
-XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
-
-BROWSER_CHROME_MANIFESTS += ['browser.ini']
-

browser/devtools/sourceeditor/moz.build

@@ -4,8 +4,6 @@
 # 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']
-
 JS_MODULES_PATH = 'modules/devtools/sourceeditor'
 
 EXTRA_JS_MODULES += [
@@ -16,3 +14,4 @@ EXTRA_JS_MODULES += [
     'editor.js'
 ]
 
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/sourceeditor/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   cm_comment_test.js
   cm_doc_test.js

browser/devtools/sourceeditor/test/moz.build

@@ -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']
-

browser/devtools/styleeditor/moz.build

@@ -4,4 +4,4 @@
 # 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_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/styleeditor/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   autocomplete.html
   browser_styleeditor_cmd_edit.html

browser/devtools/styleeditor/test/moz.build

@@ -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']
-

browser/devtools/styleinspector/moz.build

@@ -4,4 +4,5 @@
 # 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_CHROME_MANIFESTS += ['test/browser.ini']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']

browser/devtools/styleinspector/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   doc_content_stylesheet.html
   doc_content_stylesheet.xul

browser/devtools/styleinspector/test/moz.build

@@ -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']
-XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']

browser/devtools/tilt/moz.build

@@ -16,4 +16,4 @@ EXTRA_JS_MODULES += [
     'TiltWorkerPicker.js'
 ]
 
-TEST_DIRS += ['test']
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/tilt/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files = head.js
 
 [browser_tilt_01_lazy_getter.js]

browser/devtools/tilt/test/moz.build

@@ -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']
-

browser/devtools/webaudioeditor/moz.build

@@ -3,10 +3,9 @@
 # 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']
-
 JS_MODULES_PATH = 'modules/devtools/webaudioeditor'
 
 EXTRA_JS_MODULES += [
 ]
 
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/webaudioeditor/test/browser.ini

@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
 support-files =
   doc_simple-context.html

browser/devtools/webaudioeditor/test/moz.build

@@ -1,6 +0,0 @@
-# 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']

browser/devtools/webconsole/moz.build

@@ -4,4 +4,4 @@
 # 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_CHROME_MANIFESTS += ['test/browser.ini']

browser/devtools/webconsole/test/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 subsuite = devtools
-
 support-files =
   head.js
   test-bug-585956-console-trace.html

browser/devtools/webconsole/test/moz.build

@@ -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']
-