From fd270f3c09e78ab3a1c9ce335921dd5e1386c157 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 28 Nov 2013 15:03:16 +0100 Subject: [PATCH] Bug 939271 - Part c: move mochitests to manifests in browser/devtools/styleinspector/test; r=mshal --- .../devtools/styleinspector/test/Makefile.in | 61 ++----------------- .../devtools/styleinspector/test/browser.ini | 55 +++++++++++++++++ .../devtools/styleinspector/test/moz.build | 1 + 3 files changed, 61 insertions(+), 56 deletions(-) create mode 100644 browser/devtools/styleinspector/test/browser.ini diff --git a/browser/devtools/styleinspector/test/Makefile.in b/browser/devtools/styleinspector/test/Makefile.in index 1653799e839..c8ae4b4596e 100644 --- a/browser/devtools/styleinspector/test/Makefile.in +++ b/browser/devtools/styleinspector/test/Makefile.in @@ -3,63 +3,12 @@ # 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 = \ - browser_bug683672.js \ - browser_styleinspector_bug_672746_default_styles.js \ - browser_styleinspector_bug_672744_search_filter.js \ - $(filter awaiting-promise-based-init, browser_bug589375_keybindings.js) \ - browser_styleinspector_bug_689759_no_results_placeholder.js \ - browser_bug_692400_element_style.js \ - browser_csslogic_inherited.js \ - browser_ruleview_734259_style_editor_link.js \ - browser_ruleview_editor.js \ - browser_ruleview_editor_changedvalues.js \ - browser_ruleview_copy.js \ - browser_ruleview_focus.js \ - browser_ruleview_inherit.js \ - browser_ruleview_manipulation.js \ - browser_ruleview_override.js \ - browser_ruleview_ui.js \ - browser_ruleview_update.js \ - browser_ruleview_livepreview.js \ - browser_bug705707_is_content_stylesheet.js \ - browser_bug722196_property_view_media_queries.js \ - browser_bug722196_rule_view_media_queries.js \ - browser_bug_592743_specificity.js \ - browser_bug722691_rule_view_increment.js \ - browser_computedview_734259_style_editor_link.js \ - browser_computedview_copy.js\ - browser_styleinspector_bug_677930_urls_clickable.js \ - browser_bug893965_css_property_completion_new_property.js \ - browser_bug893965_css_property_completion_existing_property.js \ - browser_bug894376_css_value_completion_new_property_value_pair.js \ - browser_bug894376_css_value_completion_existing_property_value_pair.js \ - browser_ruleview_bug_902966_revert_value_on_ESC.js \ - browser_ruleview_pseudoelement.js \ - browser_computedview_bug835808_keyboard_nav.js \ - browser_bug913014_matched_expand.js \ - browser_bug765105_background_image_tooltip.js \ - browser_bug889638_rule_view_color_picker.js \ - head.js \ - $(NULL) +include $(topsrcdir)/config/makefiles/mochitest.mk -MOCHITEST_BROWSER_FILES += \ - browser_bug683672.html \ - browser_bug705707_is_content_stylesheet.html \ - browser_bug705707_is_content_stylesheet_imported.css \ - browser_bug705707_is_content_stylesheet_imported2.css \ - browser_bug705707_is_content_stylesheet_linked.css \ - browser_bug705707_is_content_stylesheet_script.css \ - browser_bug705707_is_content_stylesheet.xul \ - browser_bug705707_is_content_stylesheet_xul.css \ - browser_bug722196_identify_media_queries.html \ - browser_styleinspector_bug_677930_urls_clickable.html \ - test-image.png \ - browser_ruleview_pseudoelement.html \ - $(NULL) +mochitest_browser_dest := $(call mochitestdir,browser) -MOCHITEST_BUG_677940_DATA_FILES = \ +mochitest_bug_677930_data_FILES = \ browser_styleinspector_bug_677930_urls_clickable/browser_styleinspector_bug_677930_urls_clickable.css \ $(NULL) -MOCHITEST_BUG_677940_DATA_DEST = $(MOCHITEST_BROWSER_DEST)/browser_styleinspector_bug_677930_urls_clickable -INSTALL_TARGETS += MOCHITEST_BUG_677940_DATA +mochitest_bug_677930_data_DEST = $(mochitest_browser_dest)/browser_styleinspector_bug_677930_urls_clickable +INSTALL_TARGETS += mochitest_bug_677930_data diff --git a/browser/devtools/styleinspector/test/browser.ini b/browser/devtools/styleinspector/test/browser.ini new file mode 100644 index 00000000000..0ca9347280a --- /dev/null +++ b/browser/devtools/styleinspector/test/browser.ini @@ -0,0 +1,55 @@ +[DEFAULT] +support-files = + head.js + browser_bug722196_identify_media_queries.html + +[browser_bug683672.js] +support-files = browser_bug683672.html +[browser_styleinspector_bug_672746_default_styles.js] +[browser_styleinspector_bug_672744_search_filter.js] +[browser_bug589375_keybindings.js] +skip-if = true # awaiting promise-based init +[browser_styleinspector_bug_689759_no_results_placeholder.js] +[browser_bug_692400_element_style.js] +[browser_csslogic_inherited.js] +[browser_ruleview_734259_style_editor_link.js] +[browser_ruleview_editor.js] +[browser_ruleview_editor_changedvalues.js] +[browser_ruleview_copy.js] +[browser_ruleview_focus.js] +[browser_ruleview_inherit.js] +[browser_ruleview_manipulation.js] +[browser_ruleview_override.js] +[browser_ruleview_ui.js] +[browser_ruleview_update.js] +[browser_ruleview_livepreview.js] +[browser_bug705707_is_content_stylesheet.js] +support-files = + browser_bug705707_is_content_stylesheet.html + browser_bug705707_is_content_stylesheet_imported.css + browser_bug705707_is_content_stylesheet_imported2.css + browser_bug705707_is_content_stylesheet_linked.css + browser_bug705707_is_content_stylesheet_script.css + browser_bug705707_is_content_stylesheet.xul + browser_bug705707_is_content_stylesheet_xul.css +[browser_bug722196_property_view_media_queries.js] +[browser_bug722196_rule_view_media_queries.js] +[browser_bug_592743_specificity.js] +[browser_bug722691_rule_view_increment.js] +[browser_computedview_734259_style_editor_link.js] +[browser_computedview_copy.js] +[browser_styleinspector_bug_677930_urls_clickable.js] +support-files = + test-image.png + browser_styleinspector_bug_677930_urls_clickable.html +[browser_bug893965_css_property_completion_new_property.js] +[browser_bug893965_css_property_completion_existing_property.js] +[browser_bug894376_css_value_completion_new_property_value_pair.js] +[browser_bug894376_css_value_completion_existing_property_value_pair.js] +[browser_ruleview_bug_902966_revert_value_on_ESC.js] +[browser_ruleview_pseudoelement.js] +support-files = browser_ruleview_pseudoelement.html +[browser_computedview_bug835808_keyboard_nav.js] +[browser_bug913014_matched_expand.js] +[browser_bug765105_background_image_tooltip.js] +[browser_bug889638_rule_view_color_picker.js] diff --git a/browser/devtools/styleinspector/test/moz.build b/browser/devtools/styleinspector/test/moz.build index 895d11993cf..24a69089d2d 100644 --- a/browser/devtools/styleinspector/test/moz.build +++ b/browser/devtools/styleinspector/test/moz.build @@ -4,3 +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/. +BROWSER_CHROME_MANIFESTS += ['browser.ini']