From 175692b3d170cce63bbd04e7dfef76c6bd5ac0f4 Mon Sep 17 00:00:00 2001 From: Mark Hammond Date: Tue, 10 Dec 2013 09:24:37 +1100 Subject: [PATCH] Bug 947770 - Move remaining tests in browser/devtools/webconsole/test/Makefile.in to manifest. r=ted --- browser/devtools/webconsole/test/Makefile.in | 16 ---------------- browser/devtools/webconsole/test/browser.ini | 4 ++++ 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 browser/devtools/webconsole/test/Makefile.in diff --git a/browser/devtools/webconsole/test/Makefile.in b/browser/devtools/webconsole/test/Makefile.in deleted file mode 100644 index e762e23300e6..000000000000 --- a/browser/devtools/webconsole/test/Makefile.in +++ /dev/null @@ -1,16 +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/. - -ifeq ($(OS_ARCH), Darwin) -MOCHITEST_BROWSER_FILES += \ - browser_webconsole_bug_804845_ctrl_key_nav.js \ - $(NULL) -endif - -ifeq ($(OS_ARCH),WINNT) -MOCHITEST_BROWSER_FILES += \ - browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js \ - $(NULL) -endif - diff --git a/browser/devtools/webconsole/test/browser.ini b/browser/devtools/webconsole/test/browser.ini index 6374c111f012..56806b33c661 100644 --- a/browser/devtools/webconsole/test/browser.ini +++ b/browser/devtools/webconsole/test/browser.ini @@ -185,6 +185,8 @@ support-files = [browser_webconsole_bug_618311_close_panels.js] [browser_webconsole_bug_621644_jsterm_dollar.js] [browser_webconsole_bug_622303_persistent_filters.js] +[browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js] +run-if = os == "win" [browser_webconsole_bug_630733_response_redirect_headers.js] [browser_webconsole_bug_632275_getters_document_width.js] [browser_webconsole_bug_632347_iterators_generators.js] @@ -210,6 +212,8 @@ support-files = [browser_webconsole_bug_770099_bad_policyuri.js] [browser_webconsole_bug_770099_violation.js] [browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js] +[browser_webconsole_bug_804845_ctrl_key_nav.js] +run-if = os == "mac" [browser_webconsole_bug_817834_add_edited_input_to_history.js] [browser_webconsole_bug_821877_csp_errors.js] [browser_webconsole_bug_837351_securityerrors.js]