diff --git a/browser/devtools/app-manager/moz.build b/browser/devtools/app-manager/moz.build index 86ec4674859a..c65e2eeca482 100644 --- a/browser/devtools/app-manager/moz.build +++ b/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'] diff --git a/browser/devtools/app-manager/test/browser.ini b/browser/devtools/app-manager/test/browser.ini index 0eabc6dac9d6..9ee6f48285fb 100644 --- a/browser/devtools/app-manager/test/browser.ini +++ b/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 diff --git a/browser/devtools/app-manager/test/moz.build b/browser/devtools/app-manager/test/moz.build deleted file mode 100644 index 7240e5a0423a..000000000000 --- a/browser/devtools/app-manager/test/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'] -MOCHITEST_CHROME_MANIFESTS += ['chrome.ini'] diff --git a/browser/devtools/canvasdebugger/moz.build b/browser/devtools/canvasdebugger/moz.build index 15c30cc24670..39e17e5b5a74 100644 --- a/browser/devtools/canvasdebugger/moz.build +++ b/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'] diff --git a/browser/devtools/canvasdebugger/test/moz.build b/browser/devtools/canvasdebugger/test/moz.build deleted file mode 100644 index a21913edfc3e..000000000000 --- a/browser/devtools/canvasdebugger/test/moz.build +++ /dev/null @@ -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'] diff --git a/browser/devtools/commandline/test/browser.ini b/browser/devtools/commandline/test/browser.ini index 5aa1f9677136..7efd84dae0de 100644 --- a/browser/devtools/commandline/test/browser.ini +++ b/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 diff --git a/browser/devtools/debugger/moz.build b/browser/devtools/debugger/moz.build index 7ab5fd44c0b2..90c8338e611d 100644 --- a/browser/devtools/debugger/moz.build +++ b/browser/devtools/debugger/moz.build @@ -11,4 +11,3 @@ EXTRA_JS_MODULES += [ ] BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] - diff --git a/browser/devtools/debugger/test/browser.ini b/browser/devtools/debugger/test/browser.ini index e777b9e97cc4..828381d8b241 100644 --- a/browser/devtools/debugger/test/browser.ini +++ b/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 diff --git a/browser/devtools/eyedropper/moz.build b/browser/devtools/eyedropper/moz.build index c8bdf0ccbc67..2c2523d00c27 100644 --- a/browser/devtools/eyedropper/moz.build +++ b/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'] diff --git a/browser/devtools/eyedropper/test/browser.ini b/browser/devtools/eyedropper/test/browser.ini index 4386cfb00a62..ef6034107353 100644 --- a/browser/devtools/eyedropper/test/browser.ini +++ b/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 diff --git a/browser/devtools/eyedropper/test/moz.build b/browser/devtools/eyedropper/test/moz.build deleted file mode 100644 index a21913edfc3e..000000000000 --- a/browser/devtools/eyedropper/test/moz.build +++ /dev/null @@ -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'] diff --git a/browser/devtools/fontinspector/moz.build b/browser/devtools/fontinspector/moz.build index 86ec4674859a..1f094a9573d7 100644 --- a/browser/devtools/fontinspector/moz.build +++ b/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'] diff --git a/browser/devtools/fontinspector/test/browser.ini b/browser/devtools/fontinspector/test/browser.ini index f7783d07b24b..430070ab1561 100644 --- a/browser/devtools/fontinspector/test/browser.ini +++ b/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 diff --git a/browser/devtools/fontinspector/test/moz.build b/browser/devtools/fontinspector/test/moz.build deleted file mode 100644 index 33f04f853787..000000000000 --- a/browser/devtools/fontinspector/test/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'] - diff --git a/browser/devtools/framework/moz.build b/browser/devtools/framework/moz.build index 86ec4674859a..1f094a9573d7 100644 --- a/browser/devtools/framework/moz.build +++ b/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'] diff --git a/browser/devtools/framework/test/browser.ini b/browser/devtools/framework/test/browser.ini index 503e69fbc66c..c1de7c676940 100644 --- a/browser/devtools/framework/test/browser.ini +++ b/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 diff --git a/browser/devtools/framework/test/moz.build b/browser/devtools/framework/test/moz.build deleted file mode 100644 index 33f04f853787..000000000000 --- a/browser/devtools/framework/test/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'] - diff --git a/browser/devtools/inspector/moz.build b/browser/devtools/inspector/moz.build index 3d15f02da4e2..f8eb56ec7b40 100644 --- a/browser/devtools/inspector/moz.build +++ b/browser/devtools/inspector/moz.build @@ -11,4 +11,4 @@ EXTRA_JS_MODULES += [ 'selector-search.js' ] -TEST_DIRS += ['test'] +BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] diff --git a/browser/devtools/inspector/test/browser.ini b/browser/devtools/inspector/test/browser.ini index 40b0219d34a5..3b04d100d230 100644 --- a/browser/devtools/inspector/test/browser.ini +++ b/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 diff --git a/browser/devtools/inspector/test/moz.build b/browser/devtools/inspector/test/moz.build deleted file mode 100644 index 33f04f853787..000000000000 --- a/browser/devtools/inspector/test/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'] - diff --git a/browser/devtools/layoutview/moz.build b/browser/devtools/layoutview/moz.build index 5abe8b3be9a3..413e62508b39 100644 --- a/browser/devtools/layoutview/moz.build +++ b/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'] diff --git a/browser/devtools/layoutview/test/browser.ini b/browser/devtools/layoutview/test/browser.ini index 829f060598f8..33813a514c11 100644 --- a/browser/devtools/layoutview/test/browser.ini +++ b/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 diff --git a/browser/devtools/layoutview/test/moz.build b/browser/devtools/layoutview/test/moz.build deleted file mode 100644 index 33f04f853787..000000000000 --- a/browser/devtools/layoutview/test/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'] - diff --git a/browser/devtools/markupview/moz.build b/browser/devtools/markupview/moz.build index 86ec4674859a..1f094a9573d7 100644 --- a/browser/devtools/markupview/moz.build +++ b/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'] diff --git a/browser/devtools/markupview/test/browser.ini b/browser/devtools/markupview/test/browser.ini index b8e6619a30b4..21511a71e128 100644 --- a/browser/devtools/markupview/test/browser.ini +++ b/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 diff --git a/browser/devtools/markupview/test/moz.build b/browser/devtools/markupview/test/moz.build deleted file mode 100644 index 33f04f853787..000000000000 --- a/browser/devtools/markupview/test/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'] - diff --git a/browser/devtools/netmonitor/moz.build b/browser/devtools/netmonitor/moz.build index 0221fd39541a..263d589c3656 100644 --- a/browser/devtools/netmonitor/moz.build +++ b/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'] diff --git a/browser/devtools/netmonitor/test/browser.ini b/browser/devtools/netmonitor/test/browser.ini index 6a4b83898c5f..d8eab3f82654 100644 --- a/browser/devtools/netmonitor/test/browser.ini +++ b/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 diff --git a/browser/devtools/netmonitor/test/moz.build b/browser/devtools/netmonitor/test/moz.build deleted file mode 100644 index 9162f1d0b469..000000000000 --- a/browser/devtools/netmonitor/test/moz.build +++ /dev/null @@ -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'] - diff --git a/browser/devtools/profiler/moz.build b/browser/devtools/profiler/moz.build index 86ec4674859a..1f094a9573d7 100644 --- a/browser/devtools/profiler/moz.build +++ b/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'] diff --git a/browser/devtools/profiler/test/browser.ini b/browser/devtools/profiler/test/browser.ini index 82f8fdc187a2..5f22ea8ee7bd 100644 --- a/browser/devtools/profiler/test/browser.ini +++ b/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 diff --git a/browser/devtools/profiler/test/moz.build b/browser/devtools/profiler/test/moz.build deleted file mode 100644 index 33f04f853787..000000000000 --- a/browser/devtools/profiler/test/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'] - diff --git a/browser/devtools/responsivedesign/moz.build b/browser/devtools/responsivedesign/moz.build index 39d5b42b24c4..487911b83342 100644 --- a/browser/devtools/responsivedesign/moz.build +++ b/browser/devtools/responsivedesign/moz.build @@ -8,4 +8,4 @@ EXTRA_JS_MODULES += [ 'resize-commands.js' ] -TEST_DIRS += ['test'] +BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] diff --git a/browser/devtools/responsivedesign/test/browser.ini b/browser/devtools/responsivedesign/test/browser.ini index e4f5e4f4fdba..ced745f44b9e 100644 --- a/browser/devtools/responsivedesign/test/browser.ini +++ b/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 diff --git a/browser/devtools/responsivedesign/test/moz.build b/browser/devtools/responsivedesign/test/moz.build deleted file mode 100644 index 33f04f853787..000000000000 --- a/browser/devtools/responsivedesign/test/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'] - diff --git a/browser/devtools/scratchpad/moz.build b/browser/devtools/scratchpad/moz.build index ac68884a8b51..498b668bd791 100644 --- a/browser/devtools/scratchpad/moz.build +++ b/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'] diff --git a/browser/devtools/scratchpad/test/browser.ini b/browser/devtools/scratchpad/test/browser.ini index 9df888115075..be82f6befd59 100644 --- a/browser/devtools/scratchpad/test/browser.ini +++ b/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] diff --git a/browser/devtools/scratchpad/test/moz.build b/browser/devtools/scratchpad/test/moz.build deleted file mode 100644 index 33f04f853787..000000000000 --- a/browser/devtools/scratchpad/test/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'] - diff --git a/browser/devtools/shadereditor/moz.build b/browser/devtools/shadereditor/moz.build index 64fa91a0c7e5..123f65256932 100644 --- a/browser/devtools/shadereditor/moz.build +++ b/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'] diff --git a/browser/devtools/shadereditor/test/browser.ini b/browser/devtools/shadereditor/test/browser.ini index 853abdcfc0a0..b6db4259e525 100644 --- a/browser/devtools/shadereditor/test/browser.ini +++ b/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 diff --git a/browser/devtools/shadereditor/test/moz.build b/browser/devtools/shadereditor/test/moz.build deleted file mode 100644 index a21913edfc3e..000000000000 --- a/browser/devtools/shadereditor/test/moz.build +++ /dev/null @@ -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'] diff --git a/browser/devtools/shared/moz.build b/browser/devtools/shared/moz.build index 86ec4674859a..a4d125b80f9c 100644 --- a/browser/devtools/shared/moz.build +++ b/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'] diff --git a/browser/devtools/shared/test/browser.ini b/browser/devtools/shared/test/browser.ini index ffbf96a32e73..79720feac1e7 100644 --- a/browser/devtools/shared/test/browser.ini +++ b/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 diff --git a/browser/devtools/shared/test/moz.build b/browser/devtools/shared/test/moz.build deleted file mode 100644 index e98b3e94ab3e..000000000000 --- a/browser/devtools/shared/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/. - -XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] - -BROWSER_CHROME_MANIFESTS += ['browser.ini'] - diff --git a/browser/devtools/sourceeditor/moz.build b/browser/devtools/sourceeditor/moz.build index 6396ba93d122..6e49065c2778 100644 --- a/browser/devtools/sourceeditor/moz.build +++ b/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'] diff --git a/browser/devtools/sourceeditor/test/browser.ini b/browser/devtools/sourceeditor/test/browser.ini index b625020cd29c..91ecaeb99314 100644 --- a/browser/devtools/sourceeditor/test/browser.ini +++ b/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 diff --git a/browser/devtools/sourceeditor/test/moz.build b/browser/devtools/sourceeditor/test/moz.build deleted file mode 100644 index 33f04f853787..000000000000 --- a/browser/devtools/sourceeditor/test/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'] - diff --git a/browser/devtools/styleeditor/moz.build b/browser/devtools/styleeditor/moz.build index 86ec4674859a..1f094a9573d7 100644 --- a/browser/devtools/styleeditor/moz.build +++ b/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'] diff --git a/browser/devtools/styleeditor/test/browser.ini b/browser/devtools/styleeditor/test/browser.ini index 2e5d7eabe7be..b5e873fe20a5 100644 --- a/browser/devtools/styleeditor/test/browser.ini +++ b/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 diff --git a/browser/devtools/styleeditor/test/moz.build b/browser/devtools/styleeditor/test/moz.build deleted file mode 100644 index 33f04f853787..000000000000 --- a/browser/devtools/styleeditor/test/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'] - diff --git a/browser/devtools/styleinspector/moz.build b/browser/devtools/styleinspector/moz.build index 86ec4674859a..a4d125b80f9c 100644 --- a/browser/devtools/styleinspector/moz.build +++ b/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'] diff --git a/browser/devtools/styleinspector/test/browser.ini b/browser/devtools/styleinspector/test/browser.ini index c04a85aadf74..47f9fb9b79b4 100644 --- a/browser/devtools/styleinspector/test/browser.ini +++ b/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 diff --git a/browser/devtools/styleinspector/test/moz.build b/browser/devtools/styleinspector/test/moz.build deleted file mode 100644 index eeecf73b718f..000000000000 --- a/browser/devtools/styleinspector/test/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'] -XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] diff --git a/browser/devtools/tilt/moz.build b/browser/devtools/tilt/moz.build index d7ff518a7ffd..3a04f7eac6c9 100644 --- a/browser/devtools/tilt/moz.build +++ b/browser/devtools/tilt/moz.build @@ -16,4 +16,4 @@ EXTRA_JS_MODULES += [ 'TiltWorkerPicker.js' ] -TEST_DIRS += ['test'] +BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] diff --git a/browser/devtools/tilt/test/browser.ini b/browser/devtools/tilt/test/browser.ini index 6ae559fbbba8..e53a5bdec341 100644 --- a/browser/devtools/tilt/test/browser.ini +++ b/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] diff --git a/browser/devtools/tilt/test/moz.build b/browser/devtools/tilt/test/moz.build deleted file mode 100644 index 33f04f853787..000000000000 --- a/browser/devtools/tilt/test/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'] - diff --git a/browser/devtools/webaudioeditor/moz.build b/browser/devtools/webaudioeditor/moz.build index 91a9dd1e7a7d..d5fd66916284 100644 --- a/browser/devtools/webaudioeditor/moz.build +++ b/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'] diff --git a/browser/devtools/webaudioeditor/test/browser.ini b/browser/devtools/webaudioeditor/test/browser.ini index c7b7a522ecb8..3e39e25513cc 100644 --- a/browser/devtools/webaudioeditor/test/browser.ini +++ b/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 diff --git a/browser/devtools/webaudioeditor/test/moz.build b/browser/devtools/webaudioeditor/test/moz.build deleted file mode 100644 index a21913edfc3e..000000000000 --- a/browser/devtools/webaudioeditor/test/moz.build +++ /dev/null @@ -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'] diff --git a/browser/devtools/webconsole/moz.build b/browser/devtools/webconsole/moz.build index 86ec4674859a..1f094a9573d7 100644 --- a/browser/devtools/webconsole/moz.build +++ b/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'] diff --git a/browser/devtools/webconsole/test/browser.ini b/browser/devtools/webconsole/test/browser.ini index b2844502b36a..1ae7a3b1cb1e 100644 --- a/browser/devtools/webconsole/test/browser.ini +++ b/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 diff --git a/browser/devtools/webconsole/test/moz.build b/browser/devtools/webconsole/test/moz.build deleted file mode 100644 index 33f04f853787..000000000000 --- a/browser/devtools/webconsole/test/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'] -