diff --git a/browser/base/content/test/chrome/chrome.ini b/browser/base/content/test/chrome/chrome.ini deleted file mode 100644 index 9882f4b64791..000000000000 --- a/browser/base/content/test/chrome/chrome.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] - -[test_aboutCrashed.xhtml] -[test_aboutRestartRequired.xhtml] diff --git a/browser/base/content/test/chrome/chrome.toml b/browser/base/content/test/chrome/chrome.toml new file mode 100644 index 000000000000..9e0d1d6d9325 --- /dev/null +++ b/browser/base/content/test/chrome/chrome.toml @@ -0,0 +1,5 @@ +[DEFAULT] + +["test_aboutCrashed.xhtml"] + +["test_aboutRestartRequired.xhtml"] diff --git a/browser/base/moz.build b/browser/base/moz.build index 97da3ae32a4c..f8bcff1730a6 100644 --- a/browser/base/moz.build +++ b/browser/base/moz.build @@ -14,7 +14,7 @@ with Files("content/docs/sslerrorreport/**"): SCHEDULES.exclusive = ["docs"] MOCHITEST_CHROME_MANIFESTS += [ - "content/test/chrome/chrome.ini", + "content/test/chrome/chrome.toml", ] BROWSER_CHROME_MANIFESTS += [ diff --git a/browser/components/aboutlogins/moz.build b/browser/components/aboutlogins/moz.build index 200b05fed627..5b11b36f5f31 100644 --- a/browser/components/aboutlogins/moz.build +++ b/browser/components/aboutlogins/moz.build @@ -19,5 +19,5 @@ FINAL_TARGET_FILES.actors += [ ] BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"] diff --git a/browser/components/aboutlogins/tests/chrome/chrome.ini b/browser/components/aboutlogins/tests/chrome/chrome.ini deleted file mode 100644 index ac1ba7076c95..000000000000 --- a/browser/components/aboutlogins/tests/chrome/chrome.ini +++ /dev/null @@ -1,13 +0,0 @@ -[DEFAULT] -scheme = https -prefs = - identity.fxaccounts.enabled=true -support-files = - aboutlogins_common.js - -[test_confirm_delete_dialog.html] -[test_fxaccounts_button.html] -[test_login_filter.html] -[test_login_item.html] -[test_login_list.html] -[test_menu_button.html] diff --git a/browser/components/aboutlogins/tests/chrome/chrome.toml b/browser/components/aboutlogins/tests/chrome/chrome.toml new file mode 100644 index 000000000000..2653b6e821ec --- /dev/null +++ b/browser/components/aboutlogins/tests/chrome/chrome.toml @@ -0,0 +1,16 @@ +[DEFAULT] +scheme = "https" +prefs = ["identity.fxaccounts.enabled=true"] +support-files = ["aboutlogins_common.js"] + +["test_confirm_delete_dialog.html"] + +["test_fxaccounts_button.html"] + +["test_login_filter.html"] + +["test_login_item.html"] + +["test_login_list.html"] + +["test_menu_button.html"] diff --git a/browser/components/firefoxview/moz.build b/browser/components/firefoxview/moz.build index 3a75062af667..8a062a9da8e9 100644 --- a/browser/components/firefoxview/moz.build +++ b/browser/components/firefoxview/moz.build @@ -22,4 +22,4 @@ BROWSER_CHROME_MANIFESTS += [ "tests/browser/firefoxview-next/browser.ini", ] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] diff --git a/browser/components/firefoxview/tests/chrome/chrome.ini b/browser/components/firefoxview/tests/chrome/chrome.ini deleted file mode 100644 index 53fd06a86053..000000000000 --- a/browser/components/firefoxview/tests/chrome/chrome.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] - -[test_card_container.html] -[test_fxview_category_navigation.html] -[test_fxview_tab_list.html] -[test_opentabs.html] diff --git a/browser/components/firefoxview/tests/chrome/chrome.toml b/browser/components/firefoxview/tests/chrome/chrome.toml new file mode 100644 index 000000000000..ed376ce13f40 --- /dev/null +++ b/browser/components/firefoxview/tests/chrome/chrome.toml @@ -0,0 +1,9 @@ +[DEFAULT] + +["test_card_container.html"] + +["test_fxview_category_navigation.html"] + +["test_fxview_tab_list.html"] + +["test_opentabs.html"] diff --git a/browser/components/migration/moz.build b/browser/components/migration/moz.build index ee26891c0647..347698199ef1 100644 --- a/browser/components/migration/moz.build +++ b/browser/components/migration/moz.build @@ -8,7 +8,7 @@ XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"] MARIONETTE_UNIT_MANIFESTS += ["tests/marionette/manifest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"] diff --git a/browser/components/migration/tests/chrome/chrome.ini b/browser/components/migration/tests/chrome/chrome.ini deleted file mode 100644 index 1aa61a4a1f16..000000000000 --- a/browser/components/migration/tests/chrome/chrome.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - ../head-common.js - -[test_migration_wizard.html] diff --git a/browser/components/migration/tests/chrome/chrome.toml b/browser/components/migration/tests/chrome/chrome.toml new file mode 100644 index 000000000000..8f1c943f310c --- /dev/null +++ b/browser/components/migration/tests/chrome/chrome.toml @@ -0,0 +1,5 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = ["../head-common.js"] + +["test_migration_wizard.html"] diff --git a/browser/components/places/moz.build b/browser/components/places/moz.build index c01962babfcc..d4831657a5b9 100644 --- a/browser/components/places/moz.build +++ b/browser/components/places/moz.build @@ -7,7 +7,7 @@ XPCSHELL_TESTS_MANIFESTS += [ "tests/unit/xpcshell.ini", ] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] BROWSER_CHROME_MANIFESTS += [ "tests/browser/browser.ini", "tests/browser/interactions/browser.ini", diff --git a/browser/components/places/tests/chrome/chrome.ini b/browser/components/places/tests/chrome/chrome.ini deleted file mode 100644 index 3ca7ebdd60ba..000000000000 --- a/browser/components/places/tests/chrome/chrome.ini +++ /dev/null @@ -1,10 +0,0 @@ -[DEFAULT] -support-files = head.js - -[test_0_bug510634.xhtml] -[test_bug1163447_selectItems_through_shortcut.xhtml] -skip-if = (os == 'win' && processor == 'aarch64') # bug 1532775 -[test_bug549192.xhtml] -[test_bug549491.xhtml] -[test_selectItems_on_nested_tree.xhtml] -[test_treeview_date.xhtml] \ No newline at end of file diff --git a/browser/components/places/tests/chrome/chrome.toml b/browser/components/places/tests/chrome/chrome.toml new file mode 100644 index 000000000000..5a5e9a209b7f --- /dev/null +++ b/browser/components/places/tests/chrome/chrome.toml @@ -0,0 +1,17 @@ +[DEFAULT] +support-files = ["head.js"] + +["test_0_bug510634.xhtml"] + +["test_bug1163447_selectItems_through_shortcut.xhtml"] +skip-if = [ + "(os == 'win' && processor == 'aarch64')", # bug 1532775 +] + +["test_bug549192.xhtml"] + +["test_bug549491.xhtml"] + +["test_selectItems_on_nested_tree.xhtml"] + +["test_treeview_date.xhtml"] diff --git a/caps/moz.build b/caps/moz.build index 7fbc71f16923..2534fbb549ee 100644 --- a/caps/moz.build +++ b/caps/moz.build @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. MOCHITEST_MANIFESTS += ["tests/mochitest/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/mochitest/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/mochitest/chrome.toml"] BROWSER_CHROME_MANIFESTS += ["tests/mochitest/browser.ini"] XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"] diff --git a/caps/tests/mochitest/chrome.ini b/caps/tests/mochitest/chrome.ini deleted file mode 100644 index 776afa34e4ba..000000000000 --- a/caps/tests/mochitest/chrome.ini +++ /dev/null @@ -1,12 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - file_data.txt - file_disableScript.html - !/caps/tests/mochitest/file_data.txt - !/caps/tests/mochitest/file_disableScript.html - -[test_bug995943.xhtml] -skip-if = (verify && debug && (os == 'mac')) -[test_addonMayLoad.html] -[test_disableScript.xhtml] diff --git a/caps/tests/mochitest/chrome.toml b/caps/tests/mochitest/chrome.toml new file mode 100644 index 000000000000..9ad9ebc65226 --- /dev/null +++ b/caps/tests/mochitest/chrome.toml @@ -0,0 +1,15 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "file_data.txt", + "file_disableScript.html", + "!/caps/tests/mochitest/file_data.txt", + "!/caps/tests/mochitest/file_disableScript.html", +] + +["test_addonMayLoad.html"] + +["test_bug995943.xhtml"] +skip-if = ["(verify && debug && (os == 'mac'))"] + +["test_disableScript.xhtml"] diff --git a/devtools/client/accessibility/moz.build b/devtools/client/accessibility/moz.build index 0b6874dfeed7..81a8cdf836ec 100644 --- a/devtools/client/accessibility/moz.build +++ b/devtools/client/accessibility/moz.build @@ -2,7 +2,7 @@ # 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_MANIFESTS += ["test/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.toml"] BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"] DIRS += ["actions", "components", "reducers", "utils"] diff --git a/devtools/client/accessibility/test/chrome/chrome.ini b/devtools/client/accessibility/test/chrome/chrome.ini deleted file mode 100644 index 58a6a144bd93..000000000000 --- a/devtools/client/accessibility/test/chrome/chrome.ini +++ /dev/null @@ -1,11 +0,0 @@ -[DEFAULT] -support-files = - head.js - contrast.snapshots.js - !/devtools/client/shared/components/test/chrome/head.js - -[test_accessible_contrast.html] -[test_accessible_learnMoreLink.html] -[test_accessible_openLink.html] -[test_accessible_relations.html] -[test_accessible_row_context_menu.html] diff --git a/devtools/client/accessibility/test/chrome/chrome.toml b/devtools/client/accessibility/test/chrome/chrome.toml new file mode 100644 index 000000000000..503e029d8e84 --- /dev/null +++ b/devtools/client/accessibility/test/chrome/chrome.toml @@ -0,0 +1,16 @@ +[DEFAULT] +support-files = [ + "head.js", + "contrast.snapshots.js", + "!/devtools/client/shared/components/test/chrome/head.js", +] + +["test_accessible_contrast.html"] + +["test_accessible_learnMoreLink.html"] + +["test_accessible_openLink.html"] + +["test_accessible_relations.html"] + +["test_accessible_row_context_menu.html"] diff --git a/devtools/client/memory/moz.build b/devtools/client/memory/moz.build index 3e3282bd2e99..88d671e4a0fa 100644 --- a/devtools/client/memory/moz.build +++ b/devtools/client/memory/moz.build @@ -26,4 +26,4 @@ DevToolsModules( BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"] XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"] -MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.toml"] diff --git a/devtools/client/memory/test/chrome/chrome.ini b/devtools/client/memory/test/chrome/chrome.ini deleted file mode 100644 index 7803bcda35f1..000000000000 --- a/devtools/client/memory/test/chrome/chrome.ini +++ /dev/null @@ -1,20 +0,0 @@ -[DEFAULT] -support-files = - head.js - -[test_CensusTreeItem_01.html] -[test_DominatorTree_01.html] -[test_DominatorTree_02.html] -[test_DominatorTree_03.html] -[test_DominatorTreeItem_01.html] -[test_Heap_01.html] -[test_Heap_02.html] -[test_Heap_03.html] -[test_Heap_04.html] -[test_Heap_05.html] -[test_List_01.html] -[test_ShortestPaths_01.html] -[test_ShortestPaths_02.html] -[test_SnapshotListItem_01.html] -[test_Toolbar_01.html] -[test_TreeMap_01.html] diff --git a/devtools/client/memory/test/chrome/chrome.toml b/devtools/client/memory/test/chrome/chrome.toml new file mode 100644 index 000000000000..0414f9d74be6 --- /dev/null +++ b/devtools/client/memory/test/chrome/chrome.toml @@ -0,0 +1,34 @@ +[DEFAULT] +support-files = ["head.js"] + +["test_CensusTreeItem_01.html"] + +["test_DominatorTreeItem_01.html"] + +["test_DominatorTree_01.html"] + +["test_DominatorTree_02.html"] + +["test_DominatorTree_03.html"] + +["test_Heap_01.html"] + +["test_Heap_02.html"] + +["test_Heap_03.html"] + +["test_Heap_04.html"] + +["test_Heap_05.html"] + +["test_List_01.html"] + +["test_ShortestPaths_01.html"] + +["test_ShortestPaths_02.html"] + +["test_SnapshotListItem_01.html"] + +["test_Toolbar_01.html"] + +["test_TreeMap_01.html"] diff --git a/devtools/client/shared/components/moz.build b/devtools/client/shared/components/moz.build index f905adc4e67d..c6125ebe4c4b 100644 --- a/devtools/client/shared/components/moz.build +++ b/devtools/client/shared/components/moz.build @@ -34,7 +34,7 @@ DevToolsModules( "VisibilityHandler.js", ) -MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.toml"] BROWSER_CHROME_MANIFESTS += [ "test/browser/browser.ini", "test/node/stubs/reps/stubs.ini", diff --git a/devtools/client/shared/components/test/chrome/chrome.ini b/devtools/client/shared/components/test/chrome/chrome.ini deleted file mode 100644 index 4d5a480ab7fe..000000000000 --- a/devtools/client/shared/components/test/chrome/chrome.ini +++ /dev/null @@ -1,46 +0,0 @@ -[DEFAULT] -support-files = - head.js - accordion.snapshots.js - -[test_accordion.html] -[test_frame_01.html] -[test_frame_02.html] -[test_GridElementWidthResizer.html] -[test_GridElementWidthResizer_RTL.html] -[test_HSplitBox_01.html] -[test_list.html] -[test_list_keyboard.html] -[test_notification_box_01.html] -[test_notification_box_02.html] -[test_notification_box_03.html] -[test_notification_box_04.html] -[test_notification_box_05.html] -[test_searchbox.html] -[test_searchbox-with-autocomplete.html] -[test_sidebar_toggle.html] -[test_smart-trace-grouping.html] -[test_smart-trace-source-maps.html] -[test_smart-trace.html] -[test_stack-trace.html] -[test_stack-trace-source-maps.html] -[test_tabs_accessibility.html] -[test_tabs_menu.html] -[test_tree_01.html] -[test_tree_02.html] -[test_tree_03.html] -[test_tree_04.html] -[test_tree_05.html] -[test_tree_06.html] -[test_tree_07.html] -[test_tree_08.html] -[test_tree_09.html] -[test_tree_10.html] -[test_tree_11.html] -[test_tree_12.html] -[test_tree_13.html] -[test_tree_14.html] -[test_tree_15.html] -[test_tree_16.html] -[test_tree-view_01.html] -[test_tree-view_02.html] diff --git a/devtools/client/shared/components/test/chrome/chrome.toml b/devtools/client/shared/components/test/chrome/chrome.toml new file mode 100644 index 000000000000..ff9a5f188348 --- /dev/null +++ b/devtools/client/shared/components/test/chrome/chrome.toml @@ -0,0 +1,87 @@ +[DEFAULT] +support-files = [ + "head.js", + "accordion.snapshots.js", +] + +["test_GridElementWidthResizer.html"] + +["test_GridElementWidthResizer_RTL.html"] + +["test_HSplitBox_01.html"] + +["test_accordion.html"] + +["test_frame_01.html"] + +["test_frame_02.html"] + +["test_list.html"] + +["test_list_keyboard.html"] + +["test_notification_box_01.html"] + +["test_notification_box_02.html"] + +["test_notification_box_03.html"] + +["test_notification_box_04.html"] + +["test_notification_box_05.html"] + +["test_searchbox-with-autocomplete.html"] + +["test_searchbox.html"] + +["test_sidebar_toggle.html"] + +["test_smart-trace-grouping.html"] + +["test_smart-trace-source-maps.html"] + +["test_smart-trace.html"] + +["test_stack-trace-source-maps.html"] + +["test_stack-trace.html"] + +["test_tabs_accessibility.html"] + +["test_tabs_menu.html"] + +["test_tree-view_01.html"] + +["test_tree-view_02.html"] + +["test_tree_01.html"] + +["test_tree_02.html"] + +["test_tree_03.html"] + +["test_tree_04.html"] + +["test_tree_05.html"] + +["test_tree_06.html"] + +["test_tree_07.html"] + +["test_tree_08.html"] + +["test_tree_09.html"] + +["test_tree_10.html"] + +["test_tree_11.html"] + +["test_tree_12.html"] + +["test_tree_13.html"] + +["test_tree_14.html"] + +["test_tree_15.html"] + +["test_tree_16.html"] diff --git a/devtools/client/webconsole/moz.build b/devtools/client/webconsole/moz.build index 84399bebfbe1..1772beb9181d 100644 --- a/devtools/client/webconsole/moz.build +++ b/devtools/client/webconsole/moz.build @@ -35,7 +35,7 @@ BROWSER_CHROME_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "test/chrome/chrome.ini", + "test/chrome/chrome.toml", ] XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"] diff --git a/devtools/client/webconsole/test/chrome/chrome.ini b/devtools/client/webconsole/test/chrome/chrome.ini deleted file mode 100644 index 0543ae5c6dc7..000000000000 --- a/devtools/client/webconsole/test/chrome/chrome.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] - -support-files = - head.js - -[test_render_perf.html] -skip-if = true # Bug 1306783 diff --git a/devtools/client/webconsole/test/chrome/chrome.toml b/devtools/client/webconsole/test/chrome/chrome.toml new file mode 100644 index 000000000000..bda01925dc3b --- /dev/null +++ b/devtools/client/webconsole/test/chrome/chrome.toml @@ -0,0 +1,6 @@ +[DEFAULT] + +support-files = ["head.js"] + +["test_render_perf.html"] +skip-if = ["true"] # Bug 1306783 diff --git a/devtools/server/moz.build b/devtools/server/moz.build index ac1999b89b66..944e87fc2fc9 100644 --- a/devtools/server/moz.build +++ b/devtools/server/moz.build @@ -18,7 +18,7 @@ DIRS += [ if CONFIG["MOZ_BUILD_APP"] != "mobile/android": BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"] DevToolsModules( diff --git a/devtools/server/socket/moz.build b/devtools/server/socket/moz.build index 1d3766c192d5..1e0b5cf94243 100644 --- a/devtools/server/socket/moz.build +++ b/devtools/server/socket/moz.build @@ -4,7 +4,7 @@ # 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_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] DevToolsModules( "websocket-server.js", diff --git a/devtools/server/socket/tests/chrome/chrome.ini b/devtools/server/socket/tests/chrome/chrome.ini deleted file mode 100644 index cfbb6129544c..000000000000 --- a/devtools/server/socket/tests/chrome/chrome.ini +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] -tags = devtools -[test_websocket-server.html] diff --git a/devtools/server/socket/tests/chrome/chrome.toml b/devtools/server/socket/tests/chrome/chrome.toml new file mode 100644 index 000000000000..2d53e5731d4f --- /dev/null +++ b/devtools/server/socket/tests/chrome/chrome.toml @@ -0,0 +1,4 @@ +[DEFAULT] +tags = "devtools" + +["test_websocket-server.html"] diff --git a/devtools/server/tests/chrome/chrome.ini b/devtools/server/tests/chrome/chrome.ini deleted file mode 100644 index f57bc7ae81f0..000000000000 --- a/devtools/server/tests/chrome/chrome.ini +++ /dev/null @@ -1,92 +0,0 @@ -[DEFAULT] -tags = devtools -skip-if = os == 'android' -support-files = - doc_Debugger.Source.prototype.introductionType.xhtml - Debugger.Source.prototype.element.js - Debugger.Source.prototype.element-2.js - Debugger.Source.prototype.element.html - hello-actor.js - iframe1_makeGlobalObjectReference.html - iframe2_makeGlobalObjectReference.html - inspector_css-properties.html - inspector_display-type.html - inspector_getImageData.html - inspector_getOffsetParent.html - inspector-delay-image-response.sjs - inspector-eyedropper.html - inspector-helpers.js - inspector-search-data.html - inspector-styles-data.css - inspector-styles-data.html - inspector-template.html - inspector-traversal-data.html - large-image.jpg - memory-helpers.js - nonchrome_unsafeDereference.html - suspendTimeouts_content.html - suspendTimeouts_content.js - suspendTimeouts_worker.js - small-image.gif - test_suspendTimeouts.js - webconsole-helpers.js - inactive-property-helper/*.mjs -[test_animation-type-longhand.html] -[test_css-logic.html] -[test_css-logic-media-queries.html] -[test_css-logic-specificity.html] -[test_css-properties.html] -[test_Debugger.Source.prototype.introductionScript.html] -[test_Debugger.Source.prototype.introductionType.html] -[test_Debugger.Source.prototype.elementAttribute.html] -[test_Debugger.Script.prototype.global.html] -[test_device.html] -[test_executeInGlobal-outerized_this.html] -[test_highlighter_paused_debugger.html] -[test_inspector-changeattrs.html] -[test_inspector-changevalue.html] -[test_inspector-display-type.html] -[test_inspector-duplicate-node.html] -[test_inspector_getImageData.html] -[test_inspector_getImageDataFromURL.html] -[test_inspector_getImageData-wait-for-load.html] -[test_inspector_getNodeFromActor.html] -[test_inspector_getOffsetParent.html] -[test_inspector-hide.html] -[test_inspector-inactive-property-helper.html] -[test_inspector-mutations-attr.html] -[test_inspector-mutations-events.html] -[test_inspector-mutations-value.html] -[test_inspector-pick-color.html] -[test_inspector-pseudoclass-lock.html] -[test_inspector-reload.html] -[test_inspector-resize.html] -[test_inspector-resolve-url.html] -[test_inspector-search-front.html] -[test_inspector-scroll-into-view.html] -[test_inspector-template.html] -[test_makeGlobalObjectReference.html] -[test_memory.html] -[test_memory_allocations_02.html] -[test_memory_allocations_03.html] -[test_memory_allocations_04.html] -[test_memory_allocations_05.html] -[test_memory_allocations_06.html] -[test_memory_allocations_07.html] -[test_memory_attach_01.html] -[test_memory_attach_02.html] -[test_memory_census.html] -[test_memory_gc_01.html] -[test_memory_gc_events.html] -[test_overflowing-children.html] -[test_overflowing-body.html] -[test_preference.html] -[test_styles-applied.html] -[test_styles-computed.html] -[test_styles-layout.html] -[test_styles-matched.html] -[test_styles-modify.html] -[test_styles-svg.html] -[test_unsafeDereference.html] -[test_webconsole-node-grip.html] -[test_suspendTimeouts.html] diff --git a/devtools/server/tests/chrome/chrome.toml b/devtools/server/tests/chrome/chrome.toml new file mode 100644 index 000000000000..3209474b5f63 --- /dev/null +++ b/devtools/server/tests/chrome/chrome.toml @@ -0,0 +1,152 @@ +[DEFAULT] +tags = "devtools" +skip-if = ["os == 'android'"] +support-files = [ + "doc_Debugger.Source.prototype.introductionType.xhtml", + "Debugger.Source.prototype.element.js", + "Debugger.Source.prototype.element-2.js", + "Debugger.Source.prototype.element.html", + "hello-actor.js", + "iframe1_makeGlobalObjectReference.html", + "iframe2_makeGlobalObjectReference.html", + "inspector_css-properties.html", + "inspector_display-type.html", + "inspector_getImageData.html", + "inspector_getOffsetParent.html", + "inspector-delay-image-response.sjs", + "inspector-eyedropper.html", + "inspector-helpers.js", + "inspector-search-data.html", + "inspector-styles-data.css", + "inspector-styles-data.html", + "inspector-template.html", + "inspector-traversal-data.html", + "large-image.jpg", + "memory-helpers.js", + "nonchrome_unsafeDereference.html", + "suspendTimeouts_content.html", + "suspendTimeouts_content.js", + "suspendTimeouts_worker.js", + "small-image.gif", + "test_suspendTimeouts.js", + "webconsole-helpers.js", + "inactive-property-helper/*.mjs", +] + +["test_Debugger.Script.prototype.global.html"] + +["test_Debugger.Source.prototype.elementAttribute.html"] + +["test_Debugger.Source.prototype.introductionScript.html"] + +["test_Debugger.Source.prototype.introductionType.html"] + +["test_animation-type-longhand.html"] + +["test_css-logic-media-queries.html"] + +["test_css-logic-specificity.html"] + +["test_css-logic.html"] + +["test_css-properties.html"] + +["test_device.html"] + +["test_executeInGlobal-outerized_this.html"] + +["test_highlighter_paused_debugger.html"] + +["test_inspector-changeattrs.html"] + +["test_inspector-changevalue.html"] + +["test_inspector-display-type.html"] + +["test_inspector-duplicate-node.html"] + +["test_inspector-hide.html"] + +["test_inspector-inactive-property-helper.html"] + +["test_inspector-mutations-attr.html"] + +["test_inspector-mutations-events.html"] + +["test_inspector-mutations-value.html"] + +["test_inspector-pick-color.html"] + +["test_inspector-pseudoclass-lock.html"] + +["test_inspector-reload.html"] + +["test_inspector-resize.html"] + +["test_inspector-resolve-url.html"] + +["test_inspector-scroll-into-view.html"] + +["test_inspector-search-front.html"] + +["test_inspector-template.html"] + +["test_inspector_getImageData-wait-for-load.html"] + +["test_inspector_getImageData.html"] + +["test_inspector_getImageDataFromURL.html"] + +["test_inspector_getNodeFromActor.html"] + +["test_inspector_getOffsetParent.html"] + +["test_makeGlobalObjectReference.html"] + +["test_memory.html"] + +["test_memory_allocations_02.html"] + +["test_memory_allocations_03.html"] + +["test_memory_allocations_04.html"] + +["test_memory_allocations_05.html"] + +["test_memory_allocations_06.html"] + +["test_memory_allocations_07.html"] + +["test_memory_attach_01.html"] + +["test_memory_attach_02.html"] + +["test_memory_census.html"] + +["test_memory_gc_01.html"] + +["test_memory_gc_events.html"] + +["test_overflowing-body.html"] + +["test_overflowing-children.html"] + +["test_preference.html"] + +["test_styles-applied.html"] + +["test_styles-computed.html"] + +["test_styles-layout.html"] + +["test_styles-matched.html"] + +["test_styles-modify.html"] + +["test_styles-svg.html"] + +["test_suspendTimeouts.html"] + +["test_unsafeDereference.html"] + +["test_webconsole-node-grip.html"] diff --git a/devtools/shared/heapsnapshot/moz.build b/devtools/shared/heapsnapshot/moz.build index e3d77eadb856..d7ab003a6341 100644 --- a/devtools/shared/heapsnapshot/moz.build +++ b/devtools/shared/heapsnapshot/moz.build @@ -11,7 +11,7 @@ if CONFIG["ENABLE_TESTS"]: DIRS += ["tests/gtest"] XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"] EXPORTS.mozilla.devtools += [ diff --git a/devtools/shared/heapsnapshot/tests/chrome/chrome.ini b/devtools/shared/heapsnapshot/tests/chrome/chrome.ini deleted file mode 100644 index 497b6fe37ea0..000000000000 --- a/devtools/shared/heapsnapshot/tests/chrome/chrome.ini +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -tags = devtools devtools-memory -skip-if = os == 'android' -support-files = - -[test_DominatorTree_01.html] -[test_SaveHeapSnapshot.html] - diff --git a/devtools/shared/heapsnapshot/tests/chrome/chrome.toml b/devtools/shared/heapsnapshot/tests/chrome/chrome.toml new file mode 100644 index 000000000000..afe21d17fa22 --- /dev/null +++ b/devtools/shared/heapsnapshot/tests/chrome/chrome.toml @@ -0,0 +1,7 @@ +[DEFAULT] +tags = "devtools devtools-memory" +skip-if = ["os == 'android'"] + +["test_DominatorTree_01.html"] + +["test_SaveHeapSnapshot.html"] diff --git a/devtools/shared/moz.build b/devtools/shared/moz.build index 556c6002856a..0514b55e8860 100644 --- a/devtools/shared/moz.build +++ b/devtools/shared/moz.build @@ -40,7 +40,7 @@ if CONFIG["MOZ_BUILD_APP"] != "mobile/android": BROWSER_CHROME_MANIFESTS += ["test-helpers/browser.ini"] XPCSHELL_TESTS_MANIFESTS += ["test-helpers/xpcshell.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"] JAR_MANIFESTS += ["jar.mn"] diff --git a/devtools/shared/qrcode/moz.build b/devtools/shared/qrcode/moz.build index 241793b4017d..0600f4f3ea29 100644 --- a/devtools/shared/qrcode/moz.build +++ b/devtools/shared/qrcode/moz.build @@ -15,4 +15,4 @@ DevToolsModules( ) XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] diff --git a/devtools/shared/qrcode/tests/chrome/chrome.ini b/devtools/shared/qrcode/tests/chrome/chrome.ini deleted file mode 100644 index f73f845e743d..000000000000 --- a/devtools/shared/qrcode/tests/chrome/chrome.ini +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -tags = devtools - -[test_decode.html] diff --git a/devtools/shared/qrcode/tests/chrome/chrome.toml b/devtools/shared/qrcode/tests/chrome/chrome.toml new file mode 100644 index 000000000000..8df695b2aedb --- /dev/null +++ b/devtools/shared/qrcode/tests/chrome/chrome.toml @@ -0,0 +1,5 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +tags = "devtools" + +["test_decode.html"] diff --git a/devtools/shared/security/moz.build b/devtools/shared/security/moz.build index 842b85b81738..360c531e353f 100644 --- a/devtools/shared/security/moz.build +++ b/devtools/shared/security/moz.build @@ -4,7 +4,7 @@ # 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_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"] DevToolsModules( diff --git a/devtools/shared/security/tests/chrome/chrome.ini b/devtools/shared/security/tests/chrome/chrome.ini deleted file mode 100644 index 5812511032eb..000000000000 --- a/devtools/shared/security/tests/chrome/chrome.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -tags = devtools - -[test_websocket-transport.html] diff --git a/devtools/shared/security/tests/chrome/chrome.toml b/devtools/shared/security/tests/chrome/chrome.toml new file mode 100644 index 000000000000..036961ca8169 --- /dev/null +++ b/devtools/shared/security/tests/chrome/chrome.toml @@ -0,0 +1,4 @@ +[DEFAULT] +tags = "devtools" + +["test_websocket-transport.html"] diff --git a/devtools/shared/tests/chrome/chrome.ini b/devtools/shared/tests/chrome/chrome.ini deleted file mode 100644 index 026b575d3383..000000000000 --- a/devtools/shared/tests/chrome/chrome.ini +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -tags = devtools -skip-if = os == 'android' - -[test_css-logic-findCssSelector.html] -[test_css-logic-getCssPath.html] -[test_css-logic-getXPath.html] -skip-if = os == 'linux' && debug # Bug 1205739 diff --git a/devtools/shared/tests/chrome/chrome.toml b/devtools/shared/tests/chrome/chrome.toml new file mode 100644 index 000000000000..3d1dddc84ad9 --- /dev/null +++ b/devtools/shared/tests/chrome/chrome.toml @@ -0,0 +1,10 @@ +[DEFAULT] +tags = "devtools" +skip-if = ["os == 'android'"] + +["test_css-logic-findCssSelector.html"] + +["test_css-logic-getCssPath.html"] + +["test_css-logic-getXPath.html"] +skip-if = ["os == 'linux' && debug"] # Bug 1205739 diff --git a/devtools/shared/webconsole/moz.build b/devtools/shared/webconsole/moz.build index 447912436bd5..3b431d5417b7 100644 --- a/devtools/shared/webconsole/moz.build +++ b/devtools/shared/webconsole/moz.build @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. if CONFIG["OS_TARGET"] != "Android": - MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.ini"] + MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"] BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"] diff --git a/devtools/shared/webconsole/test/chrome/chrome.ini b/devtools/shared/webconsole/test/chrome/chrome.ini deleted file mode 100644 index ee903ac72704..000000000000 --- a/devtools/shared/webconsole/test/chrome/chrome.ini +++ /dev/null @@ -1,34 +0,0 @@ -[DEFAULT] -tags = devtools -support-files = - common.js - data.json - data.json^headers^ - helper_serviceworker.js - network_requests_iframe.html - sandboxed_iframe.html - console-test-worker.js - !/browser/base/content/test/general/browser_star_hsts.sjs - -[test_basics.html] -[test_cached_messages.html] -[test_consoleapi.html] -[test_consoleapi_innerID.html] -[test_console_assert.html] -[test_console_group_styling.html] -[test_console_serviceworker.html] -[test_console_serviceworker_cached.html] -[test_console_styling.html] -[test_console_timestamp.html] -[test_console_worker.html] -[test_file_uri.html] -[test_jsterm_autocomplete.html] -[test_network_get.html] -skip-if = verify -[test_network_post.html] -[test_network_security-hsts.html] -[test_nsiconsolemessage.html] -[test_object_actor.html] -[test_object_actor_native_getters.html] -[test_object_actor_native_getters_lenient_this.html] -[test_page_errors.html] diff --git a/devtools/shared/webconsole/test/chrome/chrome.toml b/devtools/shared/webconsole/test/chrome/chrome.toml new file mode 100644 index 000000000000..8cf3b2413fe3 --- /dev/null +++ b/devtools/shared/webconsole/test/chrome/chrome.toml @@ -0,0 +1,55 @@ +[DEFAULT] +tags = "devtools" +support-files = [ + "common.js", + "data.json", + "data.json^headers^", + "helper_serviceworker.js", + "network_requests_iframe.html", + "sandboxed_iframe.html", + "console-test-worker.js", + "!/browser/base/content/test/general/browser_star_hsts.sjs", +] + +["test_basics.html"] + +["test_cached_messages.html"] + +["test_console_assert.html"] + +["test_console_group_styling.html"] + +["test_console_serviceworker.html"] + +["test_console_serviceworker_cached.html"] + +["test_console_styling.html"] + +["test_console_timestamp.html"] + +["test_console_worker.html"] + +["test_consoleapi.html"] + +["test_consoleapi_innerID.html"] + +["test_file_uri.html"] + +["test_jsterm_autocomplete.html"] + +["test_network_get.html"] +skip-if = ["verify"] + +["test_network_post.html"] + +["test_network_security-hsts.html"] + +["test_nsiconsolemessage.html"] + +["test_object_actor.html"] + +["test_object_actor_native_getters.html"] + +["test_object_actor_native_getters_lenient_this.html"] + +["test_page_errors.html"] diff --git a/docshell/moz.build b/docshell/moz.build index b60e0f66ad57..f04b14b99406 100644 --- a/docshell/moz.build +++ b/docshell/moz.build @@ -28,7 +28,7 @@ MOCHITEST_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "test/chrome/chrome.ini", + "test/chrome/chrome.toml", ] BROWSER_CHROME_MANIFESTS += [ diff --git a/docshell/test/chrome/chrome.ini b/docshell/test/chrome/chrome.ini deleted file mode 100644 index e6294dbb8c92..000000000000 --- a/docshell/test/chrome/chrome.ini +++ /dev/null @@ -1,107 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - 662200a.html - 662200b.html - 662200c.html - 89419.html - bug113934_window.xhtml - bug215405_window.xhtml - bug293235.html - bug293235_p2.html - bug293235_window.xhtml - bug294258_testcase.html - bug294258_window.xhtml - bug298622_window.xhtml - bug301397_1.html - bug301397_2.html - bug301397_3.html - bug301397_4.html - bug301397_window.xhtml - bug303267.html - bug303267_window.xhtml - bug311007_window.xhtml - bug321671_window.xhtml - bug360511_case1.html - bug360511_case2.html - bug360511_window.xhtml - bug364461_window.xhtml - bug396519_window.xhtml - bug396649_window.xhtml - bug449778_window.xhtml - bug449780_window.xhtml - bug454235-subframe.xhtml - bug608669.xhtml - bug662200_window.xhtml - bug690056_window.xhtml - bug846906.html - bug89419_window.xhtml - bug909218.html - bug909218.js - docshell_helpers.js - DocShellHelpers.sys.mjs - file_viewsource_forbidden_in_iframe.html - generic.html - mozFrameType_window.xhtml - test_docRedirect.sjs - -[test_allowContentRetargeting.html] -[test_bug112564.xhtml] -support-files = - bug112564_window.xhtml - 112564_nocache.html - 112564_nocache.html^headers^ -[test_bug113934.xhtml] -[test_bug215405.xhtml] -[test_bug293235.xhtml] -skip-if = true # bug 1393441 -[test_bug294258.xhtml] -[test_bug298622.xhtml] -[test_bug301397.xhtml] -skip-if = (os == 'win' && processor == 'aarch64') # bug 1533819 -[test_bug303267.xhtml] -[test_bug311007.xhtml] -[test_bug321671.xhtml] -skip-if = - (os == "mac" && !debug) # Bug 1784831 -[test_bug360511.xhtml] -skip-if = (os == 'win' && processor == 'x86') -[test_bug364461.xhtml] -skip-if = (os == 'win' && processor == 'aarch64') # bug 1533814 -[test_bug396519.xhtml] -[test_bug396649.xhtml] -[test_bug428288.html] -[test_bug449778.xhtml] -[test_bug449780.xhtml] -[test_bug453650.xhtml] -[test_bug454235.xhtml] -[test_bug456980.xhtml] -[test_bug565388.xhtml] -skip-if = true # Bug 1026815,Bug 1546159 -[test_bug582176.xhtml] -support-files = - 582176_dummy.html - 582176_xml.xml - 582176_xslt.xsl - bug582176_window.xhtml -[test_bug608669.xhtml] -[test_bug662200.xhtml] -[test_bug690056.xhtml] -[test_bug789773.xhtml] -[test_bug846906.xhtml] -[test_bug89419.xhtml] -[test_bug909218.html] -[test_bug92598.xhtml] -support-files = - 92598_nostore.html - 92598_nostore.html^headers^ - bug92598_window.xhtml -[test_open_and_immediately_close_opener.html] -# This bug only manifests in the non-e10s window open codepath. The test -# should be updated to make sure it still opens a new window in the parent -# process if and when we start running chrome mochitests with e10s enabled. -skip-if = e10s -[test_mozFrameType.xhtml] -[test_viewsource_forbidden_in_iframe.xhtml] -skip-if = true # bug 1019315 -[test_docRedirect.xhtml] diff --git a/docshell/test/chrome/chrome.toml b/docshell/test/chrome/chrome.toml new file mode 100644 index 000000000000..37aaa1d9c11f --- /dev/null +++ b/docshell/test/chrome/chrome.toml @@ -0,0 +1,144 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "662200a.html", + "662200b.html", + "662200c.html", + "89419.html", + "bug113934_window.xhtml", + "bug215405_window.xhtml", + "bug293235.html", + "bug293235_p2.html", + "bug293235_window.xhtml", + "bug294258_testcase.html", + "bug294258_window.xhtml", + "bug298622_window.xhtml", + "bug301397_1.html", + "bug301397_2.html", + "bug301397_3.html", + "bug301397_4.html", + "bug301397_window.xhtml", + "bug303267.html", + "bug303267_window.xhtml", + "bug311007_window.xhtml", + "bug321671_window.xhtml", + "bug360511_case1.html", + "bug360511_case2.html", + "bug360511_window.xhtml", + "bug364461_window.xhtml", + "bug396519_window.xhtml", + "bug396649_window.xhtml", + "bug449778_window.xhtml", + "bug449780_window.xhtml", + "bug454235-subframe.xhtml", + "bug608669.xhtml", + "bug662200_window.xhtml", + "bug690056_window.xhtml", + "bug846906.html", + "bug89419_window.xhtml", + "bug909218.html", + "bug909218.js", + "docshell_helpers.js", + "DocShellHelpers.sys.mjs", + "file_viewsource_forbidden_in_iframe.html", + "generic.html", + "mozFrameType_window.xhtml", + "test_docRedirect.sjs", +] + +["test_allowContentRetargeting.html"] + +["test_bug112564.xhtml"] +support-files = [ + "bug112564_window.xhtml", + "112564_nocache.html", + "112564_nocache.html^headers^", +] + +["test_bug113934.xhtml"] + +["test_bug215405.xhtml"] + +["test_bug293235.xhtml"] +skip-if = ["true"] # bug 1393441 + +["test_bug294258.xhtml"] + +["test_bug298622.xhtml"] + +["test_bug301397.xhtml"] +skip-if = ["(os == 'win' && processor == 'aarch64')"] # bug 1533819 + +["test_bug303267.xhtml"] + +["test_bug311007.xhtml"] + +["test_bug321671.xhtml"] +skip-if = ["(os == 'mac' && !debug)"] # Bug 1784831 + +["test_bug360511.xhtml"] +skip-if = ["(os == 'win' && processor == 'x86')"] + +["test_bug364461.xhtml"] +skip-if = ["(os == 'win' && processor == 'aarch64')"] # bug 1533814 + +["test_bug396519.xhtml"] + +["test_bug396649.xhtml"] + +["test_bug428288.html"] + +["test_bug449778.xhtml"] + +["test_bug449780.xhtml"] + +["test_bug453650.xhtml"] + +["test_bug454235.xhtml"] + +["test_bug456980.xhtml"] + +["test_bug565388.xhtml"] +skip-if = ["true"] # Bug 1026815,Bug 1546159 + +["test_bug582176.xhtml"] +support-files = [ + "582176_dummy.html", + "582176_xml.xml", + "582176_xslt.xsl", + "bug582176_window.xhtml", +] + +["test_bug608669.xhtml"] + +["test_bug662200.xhtml"] + +["test_bug690056.xhtml"] + +["test_bug789773.xhtml"] + +["test_bug846906.xhtml"] + +["test_bug89419.xhtml"] + +["test_bug909218.html"] + +["test_bug92598.xhtml"] +support-files = [ + "92598_nostore.html", + "92598_nostore.html^headers^", + "bug92598_window.xhtml", +] + +["test_docRedirect.xhtml"] + +["test_mozFrameType.xhtml"] + +["test_open_and_immediately_close_opener.html"] +# This bug only manifests in the non-e10s window open codepath. The test +# should be updated to make sure it still opens a new window in the parent +# process if and when we start running chrome mochitests with e10s enabled. +skip-if = ["e10s"] + +["test_viewsource_forbidden_in_iframe.xhtml"] +skip-if = ["true"] # bug 1019315 diff --git a/dom/animation/moz.build b/dom/animation/moz.build index 94f0f8625f6f..015da2e8a363 100644 --- a/dom/animation/moz.build +++ b/dom/animation/moz.build @@ -8,7 +8,7 @@ with Files("**"): BUG_COMPONENT = ("Core", "DOM: Animation") MOCHITEST_MANIFESTS += ["test/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] EXPORTS.mozilla.dom += [ "Animation.h", diff --git a/dom/animation/test/chrome.ini b/dom/animation/test/chrome.ini deleted file mode 100644 index b323fca767ba..000000000000 --- a/dom/animation/test/chrome.ini +++ /dev/null @@ -1,35 +0,0 @@ -[DEFAULT] -prefs = - dom.animations-api.autoremove.enabled=true - dom.animations-api.compositing.enabled=true - dom.animations.mainthread-synchronization-with-geometric-animations=true - gfx.omta.background-color=true - layout.css.basic-shape-rect.enabled=true - layout.css.basic-shape-xywh.enabled=true - layout.css.individual-transform.enabled=true - layout.css.motion-path.enabled=true - layout.css.motion-path-basic-shapes.enabled=true - layout.css.motion-path-coord-box.enabled=true - layout.css.motion-path-offset-position.enabled=true - layout.css.motion-path-ray.enabled=true -support-files = - testcommon.js - ../../imptests/testharness.js - ../../imptests/testharnessreport.js - !/dom/animation/test/chrome/file_animate_xrays.html - -[chrome/test_animate_xrays.html] -# file_animate_xrays.html needs to go in mochitest.ini since it is served -# over HTTP -[chrome/test_animation_observers_async.html] -[chrome/test_animation_observers_sync.html] -[chrome/test_animation_performance_warning.html] -[chrome/test_animation_properties.html] -[chrome/test_animation_properties_display.html] -[chrome/test_cssanimation_missing_keyframes.html] -[chrome/test_generated_content_getAnimations.html] -[chrome/test_keyframe_effect_xrays.html] -[chrome/test_mutation_observer_for_element_removal_in_shadow_tree.html] -[chrome/test_running_on_compositor.html] -[chrome/test_simulate_compute_values_failure.html] -skip-if = !debug diff --git a/dom/animation/test/chrome.toml b/dom/animation/test/chrome.toml new file mode 100644 index 000000000000..eb6e547cac8a --- /dev/null +++ b/dom/animation/test/chrome.toml @@ -0,0 +1,48 @@ +[DEFAULT] +prefs = [ + "dom.animations-api.autoremove.enabled=true", + "dom.animations-api.compositing.enabled=true", + "dom.animations.mainthread-synchronization-with-geometric-animations=true", + "gfx.omta.background-color=true", + "layout.css.basic-shape-rect.enabled=true", + "layout.css.basic-shape-xywh.enabled=true", + "layout.css.individual-transform.enabled=true", + "layout.css.motion-path.enabled=true", + "layout.css.motion-path-basic-shapes.enabled=true", + "layout.css.motion-path-coord-box.enabled=true", + "layout.css.motion-path-offset-position.enabled=true", + "layout.css.motion-path-ray.enabled=true", +] +support-files = [ + "testcommon.js", + "../../imptests/testharness.js", + "../../imptests/testharnessreport.js", + "!/dom/animation/test/chrome/file_animate_xrays.html", +] + +["chrome/test_animate_xrays.html"] +# file_animate_xrays.html needs to go in mochitest.ini since it is served +# over HTTP + +["chrome/test_animation_observers_async.html"] + +["chrome/test_animation_observers_sync.html"] + +["chrome/test_animation_performance_warning.html"] + +["chrome/test_animation_properties.html"] + +["chrome/test_animation_properties_display.html"] + +["chrome/test_cssanimation_missing_keyframes.html"] + +["chrome/test_generated_content_getAnimations.html"] + +["chrome/test_keyframe_effect_xrays.html"] + +["chrome/test_mutation_observer_for_element_removal_in_shadow_tree.html"] + +["chrome/test_running_on_compositor.html"] + +["chrome/test_simulate_compute_values_failure.html"] +skip-if = ["!debug"] diff --git a/dom/base/test/chrome.ini b/dom/base/test/chrome.ini deleted file mode 100644 index 6b22c30c2899..000000000000 --- a/dom/base/test/chrome.ini +++ /dev/null @@ -1,43 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - file_empty.html - file_blocking_image.html - file_bug945152.jar - file_bug945152_worker.js - file_bug1008126_worker.js - file_inline_script.html - file_inline_script.xhtml - file_external_script.html - file_external_script.xhtml - file_script.js - file_serializer_noscript.html - referrer_helper.js - referrer_testserver.sjs - !/image/test/mochitest/shaver.png - -[test_anonymousContent_xul_window.xhtml] -[test_blockParsing.html] -[test_blocking_image.html] -[test_bug419527.xhtml] -[test_bug564863-2.xhtml] -[test_bug945152.html] -[test_bug1008126.html] -[test_bug1016960.html] -[test_bug1120222.html] -[test_anchor_target_blank_referrer.html] -[test_domrequesthelper.xhtml] -[test_fragment_sanitization.xhtml] -[test_getLastOverWindowPointerLocationInCSSPixels.html] -support-files = !/gfx/layers/apz/test/mochitest/apz_test_utils.js -[test_messagemanager_send_principal.html] -[test_navigator_resolve_identity_xrays.xhtml] -support-files = file_navigator_resolve_identity_xrays.xhtml -[test_sandbox_structuredclone.html] -[test_sandboxed_blob_uri.html] -[test_sendQueryContentAndSelectionSetEvent.html] -[test_sendSelectionSetEvent_with_same_range.html] -[test_urgent_start.html] -skip-if = (os == "win" && debug) || (os == "mac" && debug) #leaks Bug 1571583 -[test_sanitize_xhr.html] -[test_serializer_noscript.html] diff --git a/dom/base/test/chrome.toml b/dom/base/test/chrome.toml new file mode 100644 index 000000000000..eeb01f344da9 --- /dev/null +++ b/dom/base/test/chrome.toml @@ -0,0 +1,68 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "file_empty.html", + "file_blocking_image.html", + "file_bug945152.jar", + "file_bug945152_worker.js", + "file_bug1008126_worker.js", + "file_inline_script.html", + "file_inline_script.xhtml", + "file_external_script.html", + "file_external_script.xhtml", + "file_script.js", + "file_serializer_noscript.html", + "referrer_helper.js", + "referrer_testserver.sjs", + "!/image/test/mochitest/shaver.png", +] + +["test_anchor_target_blank_referrer.html"] + +["test_anonymousContent_xul_window.xhtml"] + +["test_blockParsing.html"] + +["test_blocking_image.html"] + +["test_bug1008126.html"] + +["test_bug1016960.html"] + +["test_bug1120222.html"] + +["test_bug419527.xhtml"] + +["test_bug564863-2.xhtml"] + +["test_bug945152.html"] + +["test_domrequesthelper.xhtml"] + +["test_fragment_sanitization.xhtml"] + +["test_getLastOverWindowPointerLocationInCSSPixels.html"] +support-files = ["!/gfx/layers/apz/test/mochitest/apz_test_utils.js"] + +["test_messagemanager_send_principal.html"] + +["test_navigator_resolve_identity_xrays.xhtml"] +support-files = ["file_navigator_resolve_identity_xrays.xhtml"] + +["test_sandbox_structuredclone.html"] + +["test_sandboxed_blob_uri.html"] + +["test_sanitize_xhr.html"] + +["test_sendQueryContentAndSelectionSetEvent.html"] + +["test_sendSelectionSetEvent_with_same_range.html"] + +["test_serializer_noscript.html"] + +["test_urgent_start.html"] +skip-if = [ #leaks Bug 1571583 + "os == 'win' && debug", + "os == 'mac' && debug", +] diff --git a/dom/base/test/chrome/chrome.ini b/dom/base/test/chrome/chrome.ini deleted file mode 100644 index 5dde748a67c1..000000000000 --- a/dom/base/test/chrome/chrome.ini +++ /dev/null @@ -1,84 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - bug418986-1.js - clonedoc/** - file_bug549682.xhtml - file_bug616841.xhtml - file_bug816340.xhtml - file_bug990812-1.xhtml - file_bug990812-2.xhtml - file_bug990812-3.xhtml - file_bug990812-4.xhtml - file_bug990812-5.xhtml - file_bug1139964.xhtml - file_bug1209621.xhtml - fileconstructor_file.png - frame_custom_element_content.html - custom_element_ep.js - window_nsITextInputProcessor.xhtml - title_window.xhtml - window_swapFrameLoaders.xhtml -prefs = - gfx.font_rendering.fallback.async=false - -[test_bug120684.xhtml] -[test_bug206691.xhtml] -[test_bug289714.xhtml] -[test_bug339494.xhtml] -[test_bug357450.xhtml] -support-files = ../file_bug357450.js -[test_bug380418.html] -[test_bug380418.html^headers^] -[test_bug383430.html] -[test_bug418986-1.xhtml] -[test_bug421622.xhtml] -[test_bug429785.xhtml] -[test_bug430050.xhtml] -[test_bug467123.xhtml] -[test_bug473284.xhtml] -[test_bug549682.xhtml] -skip-if = verify -[test_bug571390.xhtml] -[test_bug1098074_throw_from_ReceiveMessage.xhtml] -[test_bug616841.xhtml] -[test_bug635835.xhtml] -[test_bug682305.html] -[test_bug683852.xhtml] -[test_bug752226-3.xhtml] -[test_bug752226-4.xhtml] -[test_bug765993.html] -[test_bug780199.xhtml] -[test_bug780529.xhtml] -[test_bug800386.xhtml] -[test_bug816340.xhtml] -[test_bug884693.xhtml] -[test_bug914381.html] -[test_bug990812.xhtml] -[test_bug1063837.xhtml] -[test_bug1139964.xhtml] -[test_bug1209621.xhtml] -[test_bug1346936.html] -[test_chromeOuterWindowID.xhtml] -support-files = - window_chromeOuterWindowID.xhtml -[test_getElementsWithGrid.html] -[test_custom_element_content.xhtml] -[test_custom_element_ep.xhtml] -[test_document-element-inserted.xhtml] -support-files = - file_document-element-inserted.xhtml - file_document-element-inserted-inner.xhtml -[test_domparsing.xhtml] -[test_fileconstructor.xhtml] -[test_input_value_set_preserve_undo.xhtml] -[test_nsITextInputProcessor.xhtml] -[test_permission_hasValidTransientUserActivation.xhtml] -support-files = ../dummy.html -[test_range_getClientRectsAndTexts.html] -[test_title.xhtml] -support-files = file_title.xhtml -[test_windowroot.xhtml] -[test_swapFrameLoaders.xhtml] -skip-if = os == 'mac' # bug 1674413 -[test_bug1339722.html] diff --git a/dom/base/test/chrome/chrome.toml b/dom/base/test/chrome/chrome.toml new file mode 100644 index 000000000000..bf76334163c7 --- /dev/null +++ b/dom/base/test/chrome/chrome.toml @@ -0,0 +1,133 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "bug418986-1.js", + "clonedoc/**", + "file_bug549682.xhtml", + "file_bug616841.xhtml", + "file_bug816340.xhtml", + "file_bug990812-1.xhtml", + "file_bug990812-2.xhtml", + "file_bug990812-3.xhtml", + "file_bug990812-4.xhtml", + "file_bug990812-5.xhtml", + "file_bug1139964.xhtml", + "file_bug1209621.xhtml", + "fileconstructor_file.png", + "frame_custom_element_content.html", + "custom_element_ep.js", + "window_nsITextInputProcessor.xhtml", + "title_window.xhtml", + "window_swapFrameLoaders.xhtml", +] +prefs = ["gfx.font_rendering.fallback.async=false"] + +["test_bug1063837.xhtml"] + +["test_bug1098074_throw_from_ReceiveMessage.xhtml"] + +["test_bug1139964.xhtml"] + +["test_bug120684.xhtml"] + +["test_bug1209621.xhtml"] + +["test_bug1339722.html"] + +["test_bug1346936.html"] + +["test_bug206691.xhtml"] + +["test_bug289714.xhtml"] + +["test_bug339494.xhtml"] + +["test_bug357450.xhtml"] +support-files = ["../file_bug357450.js"] + +["test_bug380418.html"] + +["test_bug380418.html^headers^"] + +["test_bug383430.html"] + +["test_bug418986-1.xhtml"] + +["test_bug421622.xhtml"] + +["test_bug429785.xhtml"] + +["test_bug430050.xhtml"] + +["test_bug467123.xhtml"] + +["test_bug473284.xhtml"] + +["test_bug549682.xhtml"] +skip-if = ["verify"] + +["test_bug571390.xhtml"] + +["test_bug616841.xhtml"] + +["test_bug635835.xhtml"] + +["test_bug682305.html"] + +["test_bug683852.xhtml"] + +["test_bug752226-3.xhtml"] + +["test_bug752226-4.xhtml"] + +["test_bug765993.html"] + +["test_bug780199.xhtml"] + +["test_bug780529.xhtml"] + +["test_bug800386.xhtml"] + +["test_bug816340.xhtml"] + +["test_bug884693.xhtml"] + +["test_bug914381.html"] + +["test_bug990812.xhtml"] + +["test_chromeOuterWindowID.xhtml"] +support-files = ["window_chromeOuterWindowID.xhtml"] + +["test_custom_element_content.xhtml"] + +["test_custom_element_ep.xhtml"] + +["test_document-element-inserted.xhtml"] +support-files = [ + "file_document-element-inserted.xhtml", + "file_document-element-inserted-inner.xhtml", +] + +["test_domparsing.xhtml"] + +["test_fileconstructor.xhtml"] + +["test_getElementsWithGrid.html"] + +["test_input_value_set_preserve_undo.xhtml"] + +["test_nsITextInputProcessor.xhtml"] + +["test_permission_hasValidTransientUserActivation.xhtml"] +support-files = ["../dummy.html"] + +["test_range_getClientRectsAndTexts.html"] + +["test_swapFrameLoaders.xhtml"] +skip-if = ["os == 'mac'"] # bug 1674413 + +["test_title.xhtml"] +support-files = ["file_title.xhtml"] + +["test_windowroot.xhtml"] diff --git a/dom/base/test/fullscreen/chrome.ini b/dom/base/test/fullscreen/chrome.ini deleted file mode 100644 index cf60c0f0b570..000000000000 --- a/dom/base/test/fullscreen/chrome.ini +++ /dev/null @@ -1,10 +0,0 @@ -[DEFAULT] -tags = fullscreen - -[test_fullscreen.xhtml] -support-files = - file_MozDomFullscreen.html -[test_MozDomFullscreen_event.xhtml] -support-files = - fullscreen.xhtml - MozDomFullscreen_chrome.xhtml diff --git a/dom/base/test/fullscreen/chrome.toml b/dom/base/test/fullscreen/chrome.toml new file mode 100644 index 000000000000..0ba7862f5071 --- /dev/null +++ b/dom/base/test/fullscreen/chrome.toml @@ -0,0 +1,11 @@ +[DEFAULT] +tags = "fullscreen" + +["test_MozDomFullscreen_event.xhtml"] +support-files = [ + "fullscreen.xhtml", + "MozDomFullscreen_chrome.xhtml", +] + +["test_fullscreen.xhtml"] +support-files = "file_MozDomFullscreen.html" diff --git a/dom/base/test/fullscreen/moz.build b/dom/base/test/fullscreen/moz.build index 864fdc1e74fa..d7e27f94d1df 100644 --- a/dom/base/test/fullscreen/moz.build +++ b/dom/base/test/fullscreen/moz.build @@ -9,7 +9,7 @@ MOCHITEST_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "chrome.ini", + "chrome.toml", ] BROWSER_CHROME_MANIFESTS += [ diff --git a/dom/base/test/jsmodules/chrome.ini b/dom/base/test/jsmodules/chrome.ini deleted file mode 100644 index 9aed84e35a9d..000000000000 --- a/dom/base/test/jsmodules/chrome.ini +++ /dev/null @@ -1,53 +0,0 @@ -[DEFAULT] -support-files = - module_setRan.mjs - module_testSyntax.mjs - module_badSyntax.mjs - module_simpleImport.mjs - module_simpleExport.mjs - module_badImport.mjs - module_simple1.mjs - module_simple2.mjs - module_simple3.mjs - module_cyclic1.mjs - module_cyclic2.mjs - module_cyclic3.mjs - module_multiImports.mjs - module_multiLargeImports.mjs - script_simple2.js - module_large1.mjs - module_large2.mjs - module_large3.mjs - module_extractIntroType.mjs - iframe_extractIntroType.html - module_missingImport.mjs - -[test_moduleScriptsRun.html] -[test_moduleParsedAsModule.html] -[test_scriptNotParsedAsModule.html] -[test_typeAttrCaseInsensitive.html] -[test_moduleNotFound.html] -[test_import_meta_resolve.html] -[test_importNotFound.html] -[test_syntaxError.html] -[test_syntaxErrorAsync.html] -[test_syntaxErrorInline.html] -[test_syntaxErrorInlineAsync.html] -[test_simpleImport.html] -[test_cyclicImport.html] -[test_importResolveFailed.html] -[test_multiTopLevelImports.html] -[test_multiModuleImports.html] -[test_multiAsyncImports.html] -[test_scriptModuleOrder.html] -[test_toplevelModuleMemoization.html] -[test_importedModuleMemoization.html] -[test_multiTopLevelLargeImports.html] -[test_multiModuleLargeImports.html] -[test_asyncInlineModules.html] -[test_scriptInsertedModule.html] -[test_linkErrorInCommon1.html] -[test_linkErrorInCommon2.html] -[test_topLevelIntroType.html] -[test_importIntroType.html] -[test_dynamicImportErrorMessage.html] diff --git a/dom/base/test/jsmodules/chrome.toml b/dom/base/test/jsmodules/chrome.toml new file mode 100644 index 000000000000..423f48ec4633 --- /dev/null +++ b/dom/base/test/jsmodules/chrome.toml @@ -0,0 +1,82 @@ +[DEFAULT] +support-files = [ + "module_setRan.mjs", + "module_testSyntax.mjs", + "module_badSyntax.mjs", + "module_simpleImport.mjs", + "module_simpleExport.mjs", + "module_badImport.mjs", + "module_simple1.mjs", + "module_simple2.mjs", + "module_simple3.mjs", + "module_cyclic1.mjs", + "module_cyclic2.mjs", + "module_cyclic3.mjs", + "module_multiImports.mjs", + "module_multiLargeImports.mjs", + "script_simple2.js", + "module_large1.mjs", + "module_large2.mjs", + "module_large3.mjs", + "module_extractIntroType.mjs", + "iframe_extractIntroType.html", + "module_missingImport.mjs", +] + +["test_asyncInlineModules.html"] + +["test_cyclicImport.html"] + +["test_dynamicImportErrorMessage.html"] + +["test_importIntroType.html"] + +["test_importNotFound.html"] + +["test_importResolveFailed.html"] + +["test_import_meta_resolve.html"] + +["test_importedModuleMemoization.html"] + +["test_linkErrorInCommon1.html"] + +["test_linkErrorInCommon2.html"] + +["test_moduleNotFound.html"] + +["test_moduleParsedAsModule.html"] + +["test_moduleScriptsRun.html"] + +["test_multiAsyncImports.html"] + +["test_multiModuleImports.html"] + +["test_multiModuleLargeImports.html"] + +["test_multiTopLevelImports.html"] + +["test_multiTopLevelLargeImports.html"] + +["test_scriptInsertedModule.html"] + +["test_scriptModuleOrder.html"] + +["test_scriptNotParsedAsModule.html"] + +["test_simpleImport.html"] + +["test_syntaxError.html"] + +["test_syntaxErrorAsync.html"] + +["test_syntaxErrorInline.html"] + +["test_syntaxErrorInlineAsync.html"] + +["test_topLevelIntroType.html"] + +["test_toplevelModuleMemoization.html"] + +["test_typeAttrCaseInsensitive.html"] diff --git a/dom/base/test/jsmodules/importmaps/chrome.ini b/dom/base/test/jsmodules/importmaps/chrome.ini deleted file mode 100644 index 68811039ee0f..000000000000 --- a/dom/base/test/jsmodules/importmaps/chrome.ini +++ /dev/null @@ -1,29 +0,0 @@ -[DEFAULT] -support-files = - external_importMap.js - insert_a_base_element.js - module_simpleImportMap.mjs - module_simpleImportMap_dir.mjs - module_simpleImportMap_remap.mjs - module_simpleImportMap_remap_https.mjs - module_simpleExport.mjs - module_sortedImportMap.mjs - scope1/module_simpleExport.mjs - scope1/module_simpleImportMap.mjs - scope1/scope2/module_simpleExport.mjs - scope1/scope2/module_simpleImportMap.mjs -prefs = - dom.importMaps.enabled=true - -[test_dynamic_import_reject_importMap.html] -[test_externalImportMap.html] -[test_import_meta_resolve_importMap.html] -[test_inline_module_reject_importMap.html] -[test_load_importMap_with_base.html] -[test_load_importMap_with_base2.html] -[test_module_script_reject_importMap.html] -[test_parse_importMap_failed.html] -[test_reject_multiple_importMaps.html] -[test_simpleImportMap.html] -[test_sortedImportMap.html] - diff --git a/dom/base/test/jsmodules/importmaps/chrome.toml b/dom/base/test/jsmodules/importmaps/chrome.toml new file mode 100644 index 000000000000..54fcdd1dd2d2 --- /dev/null +++ b/dom/base/test/jsmodules/importmaps/chrome.toml @@ -0,0 +1,38 @@ +[DEFAULT] +support-files = [ + "external_importMap.js", + "insert_a_base_element.js", + "module_simpleImportMap.mjs", + "module_simpleImportMap_dir.mjs", + "module_simpleImportMap_remap.mjs", + "module_simpleImportMap_remap_https.mjs", + "module_simpleExport.mjs", + "module_sortedImportMap.mjs", + "scope1/module_simpleExport.mjs", + "scope1/module_simpleImportMap.mjs", + "scope1/scope2/module_simpleExport.mjs", + "scope1/scope2/module_simpleImportMap.mjs", +] +prefs = ["dom.importMaps.enabled=true"] + +["test_dynamic_import_reject_importMap.html"] + +["test_externalImportMap.html"] + +["test_import_meta_resolve_importMap.html"] + +["test_inline_module_reject_importMap.html"] + +["test_load_importMap_with_base.html"] + +["test_load_importMap_with_base2.html"] + +["test_module_script_reject_importMap.html"] + +["test_parse_importMap_failed.html"] + +["test_reject_multiple_importMaps.html"] + +["test_simpleImportMap.html"] + +["test_sortedImportMap.html"] diff --git a/dom/base/test/jsmodules/importmaps/moz.build b/dom/base/test/jsmodules/importmaps/moz.build index dd9fe28558c8..6dbdc469784e 100644 --- a/dom/base/test/jsmodules/importmaps/moz.build +++ b/dom/base/test/jsmodules/importmaps/moz.build @@ -4,6 +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/. -MOCHITEST_CHROME_MANIFESTS += ["chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["chrome.toml"] MOCHITEST_MANIFESTS += ["mochitest.ini"] diff --git a/dom/base/test/jsmodules/moz.build b/dom/base/test/jsmodules/moz.build index 1a7d5281ea3f..36ed0467080b 100644 --- a/dom/base/test/jsmodules/moz.build +++ b/dom/base/test/jsmodules/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/. -MOCHITEST_CHROME_MANIFESTS += ["chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["chrome.toml"] diff --git a/dom/base/test/moz.build b/dom/base/test/moz.build index 37cc3ab23963..3e62f5bef005 100644 --- a/dom/base/test/moz.build +++ b/dom/base/test/moz.build @@ -14,8 +14,8 @@ MOCHITEST_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "chrome.ini", - "chrome/chrome.ini", + "chrome.toml", + "chrome/chrome.toml", ] BROWSER_CHROME_MANIFESTS += [ diff --git a/dom/battery/moz.build b/dom/battery/moz.build index 4ef4e9848737..989afbb119d3 100644 --- a/dom/battery/moz.build +++ b/dom/battery/moz.build @@ -19,5 +19,5 @@ include("/ipc/chromium/chromium-config.mozbuild") FINAL_LIBRARY = "xul" -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] MOCHITEST_MANIFESTS += ["test/mochitest.ini"] diff --git a/dom/battery/test/chrome.ini b/dom/battery/test/chrome.ini deleted file mode 100644 index ced199bffe14..000000000000 --- a/dom/battery/test/chrome.ini +++ /dev/null @@ -1,3 +0,0 @@ -[test_battery_basics.html] -[test_battery_charging.html] -[test_battery_discharging.html] diff --git a/dom/battery/test/chrome.toml b/dom/battery/test/chrome.toml new file mode 100644 index 000000000000..2fd3810b26be --- /dev/null +++ b/dom/battery/test/chrome.toml @@ -0,0 +1,7 @@ +[DEFAULT] + +["test_battery_basics.html"] + +["test_battery_charging.html"] + +["test_battery_discharging.html"] diff --git a/dom/bindings/test/chrome.ini b/dom/bindings/test/chrome.ini deleted file mode 100644 index fc633d9ceb39..000000000000 --- a/dom/bindings/test/chrome.ini +++ /dev/null @@ -1,19 +0,0 @@ -[DEFAULT] -support-files = - !/dom/bindings/test/file_bug775543.html - !/dom/bindings/test/file_document_location_set_via_xray.html - !/dom/bindings/test/file_dom_xrays.html - !/dom/bindings/test/file_proxies_via_xray.html - -[test_bug775543.html] -[test_document_location_set_via_xray.html] -[test_dom_xrays.html] -skip-if = debug == false # TestFunctions is only available in debug builds -[test_proxies_via_xray.html] -[test_document_location_via_xray_cached.html] -[test_bug1123516_maplikesetlikechrome.xhtml] -skip-if = debug == false # TestFunctions is only available in debug builds -[test_bug1287912.html] -[test_bug1457051.html] -[test_interfaceLength_chrome.html] -skip-if = debug == false # TestFunctions is only available in debug builds diff --git a/dom/bindings/test/chrome.toml b/dom/bindings/test/chrome.toml new file mode 100644 index 000000000000..84a68a640287 --- /dev/null +++ b/dom/bindings/test/chrome.toml @@ -0,0 +1,28 @@ +[DEFAULT] +support-files = [ + "!/dom/bindings/test/file_bug775543.html", + "!/dom/bindings/test/file_document_location_set_via_xray.html", + "!/dom/bindings/test/file_dom_xrays.html", + "!/dom/bindings/test/file_proxies_via_xray.html", +] + +["test_bug1123516_maplikesetlikechrome.xhtml"] +skip-if = ["!debug"] # TestFunctions is only available in debug builds + +["test_bug1287912.html"] + +["test_bug1457051.html"] + +["test_bug775543.html"] + +["test_document_location_set_via_xray.html"] + +["test_document_location_via_xray_cached.html"] + +["test_dom_xrays.html"] +skip-if = ["debug == false"] # TestFunctions is only available in debug builds + +["test_interfaceLength_chrome.html"] +skip-if = ["debug == false"] # TestFunctions is only available in debug builds + +["test_proxies_via_xray.html"] diff --git a/dom/bindings/test/moz.build b/dom/bindings/test/moz.build index 4cc34d59dc4c..64c3610e2319 100644 --- a/dom/bindings/test/moz.build +++ b/dom/bindings/test/moz.build @@ -14,7 +14,7 @@ Library("dombindings_test_s") MOCHITEST_MANIFESTS += ["mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["chrome.toml"] TEST_WEBIDL_FILES += [ "TestCallback.webidl", diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build index 7238b2824c3a..f0696edf84f6 100644 --- a/dom/canvas/moz.build +++ b/dom/canvas/moz.build @@ -39,7 +39,7 @@ MOCHITEST_MANIFESTS += [ "test/webgl-mochitest/mochitest.ini", ] -MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.toml"] EXPORTS += [ "nsICanvasRenderingContextInternal.h", diff --git a/dom/canvas/test/chrome/chrome.ini b/dom/canvas/test/chrome/chrome.ini deleted file mode 100644 index 79070ca3cf24..000000000000 --- a/dom/canvas/test/chrome/chrome.ini +++ /dev/null @@ -1,11 +0,0 @@ -[DEFAULT] - -[test_webgl_debug_renderer_info.html] -subsuite = gpu -[test_drawWindow_widget_layers.html] -skip-if = - os == 'android' - os == 'linux' # Bug 1693807, Bug 1705410 - os == 'win' && ccov # Bug 1705410 - os == 'win' # Bug 1717900 -support-files = ../file_drawWindow_source.html ../file_drawWindow_common.js diff --git a/dom/canvas/test/chrome/chrome.toml b/dom/canvas/test/chrome/chrome.toml new file mode 100644 index 000000000000..4083885e12fc --- /dev/null +++ b/dom/canvas/test/chrome/chrome.toml @@ -0,0 +1,16 @@ +[DEFAULT] + +["test_drawWindow_widget_layers.html"] +skip-if = [ + "os == 'android'", + "os == 'linux'", # Bug 1693807, Bug 1705410 + "os == 'win' && ccov", # Bug 1705410 + "os == 'win'", # Bug 1717900 +] +support-files = [ + "../file_drawWindow_source.html", + "../file_drawWindow_common.js", +] + +["test_webgl_debug_renderer_info.html"] +subsuite = "gpu" diff --git a/dom/console/moz.build b/dom/console/moz.build index 27335d6c5f04..bbab4013db05 100644 --- a/dom/console/moz.build +++ b/dom/console/moz.build @@ -49,7 +49,7 @@ LOCAL_INCLUDES += [ ] MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"] include("/ipc/chromium/chromium-config.mozbuild") diff --git a/dom/console/tests/chrome.ini b/dom/console/tests/chrome.ini deleted file mode 100644 index b1f4e082c2a2..000000000000 --- a/dom/console/tests/chrome.ini +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - file_empty.html - console.sys.mjs - head.js - -[test_console.xhtml] -[test_jsm.xhtml] diff --git a/dom/console/tests/chrome.toml b/dom/console/tests/chrome.toml new file mode 100644 index 000000000000..5927dbb9cb0b --- /dev/null +++ b/dom/console/tests/chrome.toml @@ -0,0 +1,11 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "file_empty.html", + "console.sys.mjs", + "head.js", +] + +["test_console.xhtml"] + +["test_jsm.xhtml"] diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build index 39f056cac6f1..d7265f0e801d 100644 --- a/dom/encoding/moz.build +++ b/dom/encoding/moz.build @@ -29,5 +29,5 @@ LOCAL_INCLUDES += [ MOCHITEST_MANIFESTS += [ "test/mochitest.ini", ] -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] diff --git a/dom/encoding/test/chrome.ini b/dom/encoding/test/chrome.ini deleted file mode 100644 index 499585e1ee3f..000000000000 --- a/dom/encoding/test/chrome.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -support-files = file_stringencoding.jsm - -[test_stringencoding.xhtml] diff --git a/dom/encoding/test/chrome.toml b/dom/encoding/test/chrome.toml new file mode 100644 index 000000000000..1bb76d684169 --- /dev/null +++ b/dom/encoding/test/chrome.toml @@ -0,0 +1,4 @@ +[DEFAULT] +support-files = ["file_stringencoding.jsm"] + +["test_stringencoding.xhtml"] diff --git a/dom/events/moz.build b/dom/events/moz.build index 891f90d1725c..f7f834b7b30d 100644 --- a/dom/events/moz.build +++ b/dom/events/moz.build @@ -21,9 +21,9 @@ MOCHITEST_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "test/chrome.ini", - "test/clipboard/chrome.ini", - "test/pointerevents/chrome.ini", + "test/chrome.toml", + "test/clipboard/chrome.toml", + "test/pointerevents/chrome.toml", ] TEST_DIRS += ["test/gtest"] diff --git a/dom/events/test/chrome.ini b/dom/events/test/chrome.ini deleted file mode 100644 index 6c3014ba1dad..000000000000 --- a/dom/events/test/chrome.ini +++ /dev/null @@ -1,31 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - bug415498-doc1.html - bug415498-doc2.html - bug418986-3.js - bug591249_iframe.xhtml - bug602962.xhtml - file_bug679494.html - window_bug617528.xhtml - window_bug1412775.xhtml - test_bug336682.js - -[test_bug336682_2.xhtml] -[test_bug415498.xhtml] -[test_bug418986-3.xhtml] -[test_bug524674.xhtml] -[test_bug547996-3.xhtml] -[test_bug586961.xhtml] -[test_bug591249.xhtml] -[test_bug602962.xhtml] -[test_bug617528.xhtml] -[test_bug679494.xhtml] -[test_bug930374-chrome.html] -[test_bug1128787-1.html] -[test_bug1128787-2.html] -[test_bug1128787-3.html] -[test_bug1412775.xhtml] -[test_eventctors.xhtml] -[test_DataTransferItemList.html] -skip-if = !debug && (os == "linux") #Bug 1421150 diff --git a/dom/events/test/chrome.toml b/dom/events/test/chrome.toml new file mode 100644 index 000000000000..066065ec9f2c --- /dev/null +++ b/dom/events/test/chrome.toml @@ -0,0 +1,48 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "bug415498-doc1.html", + "bug415498-doc2.html", + "bug418986-3.js", + "bug591249_iframe.xhtml", + "bug602962.xhtml", + "file_bug679494.html", + "window_bug617528.xhtml", + "window_bug1412775.xhtml", + "test_bug336682.js", +] + +["test_DataTransferItemList.html"] +skip-if = ["!debug && (os == 'linux')"] #Bug 1421150 + +["test_bug1128787-1.html"] + +["test_bug1128787-2.html"] + +["test_bug1128787-3.html"] + +["test_bug1412775.xhtml"] + +["test_bug336682_2.xhtml"] + +["test_bug415498.xhtml"] + +["test_bug418986-3.xhtml"] + +["test_bug524674.xhtml"] + +["test_bug547996-3.xhtml"] + +["test_bug586961.xhtml"] + +["test_bug591249.xhtml"] + +["test_bug602962.xhtml"] + +["test_bug617528.xhtml"] + +["test_bug679494.xhtml"] + +["test_bug930374-chrome.html"] + +["test_eventctors.xhtml"] diff --git a/dom/events/test/clipboard/chrome.ini b/dom/events/test/clipboard/chrome.ini deleted file mode 100644 index ce646f98efe2..000000000000 --- a/dom/events/test/clipboard/chrome.ini +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] - -[test_async_clipboard.xhtml] diff --git a/dom/events/test/clipboard/chrome.toml b/dom/events/test/clipboard/chrome.toml new file mode 100644 index 000000000000..0a3107e38931 --- /dev/null +++ b/dom/events/test/clipboard/chrome.toml @@ -0,0 +1,3 @@ +[DEFAULT] + +["test_async_clipboard.xhtml"] diff --git a/dom/events/test/pointerevents/chrome.ini b/dom/events/test/pointerevents/chrome.ini deleted file mode 100644 index d5dbf50ed5ec..000000000000 --- a/dom/events/test/pointerevents/chrome.ini +++ /dev/null @@ -1 +0,0 @@ -[test_bug1697769.xhtml] diff --git a/dom/events/test/pointerevents/chrome.toml b/dom/events/test/pointerevents/chrome.toml new file mode 100644 index 000000000000..36e54e824a3b --- /dev/null +++ b/dom/events/test/pointerevents/chrome.toml @@ -0,0 +1,3 @@ +[DEFAULT] + +["test_bug1697769.xhtml"] diff --git a/dom/flex/moz.build b/dom/flex/moz.build index 802ac5b18cb9..073fa269da1e 100644 --- a/dom/flex/moz.build +++ b/dom/flex/moz.build @@ -7,7 +7,7 @@ with Files("**"): BUG_COMPONENT = ("Core", "CSS Parsing and Computation") -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] EXPORTS.mozilla.dom += [ "Flex.h", diff --git a/dom/flex/test/chrome.ini b/dom/flex/test/chrome.ini deleted file mode 100644 index 4b4bc02272c0..000000000000 --- a/dom/flex/test/chrome.ini +++ /dev/null @@ -1,7 +0,0 @@ -[chrome/test_flex_axis_directions.html] -[chrome/test_flex_item_clamp.html] -[chrome/test_flex_item_rect.html] -[chrome/test_flex_items.html] -[chrome/test_flex_lines.html] -[chrome/test_flex_object.html] -[chrome/test_flex_parent.html] diff --git a/dom/flex/test/chrome.toml b/dom/flex/test/chrome.toml new file mode 100644 index 000000000000..477f9d247652 --- /dev/null +++ b/dom/flex/test/chrome.toml @@ -0,0 +1,15 @@ +[DEFAULT] + +["chrome/test_flex_axis_directions.html"] + +["chrome/test_flex_item_clamp.html"] + +["chrome/test_flex_item_rect.html"] + +["chrome/test_flex_items.html"] + +["chrome/test_flex_lines.html"] + +["chrome/test_flex_object.html"] + +["chrome/test_flex_parent.html"] diff --git a/dom/grid/moz.build b/dom/grid/moz.build index 64d54fd8c628..d90a42131779 100644 --- a/dom/grid/moz.build +++ b/dom/grid/moz.build @@ -7,7 +7,7 @@ with Files("**"): BUG_COMPONENT = ("Core", "CSS Parsing and Computation") -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] EXPORTS.mozilla.dom += [ "Grid.h", diff --git a/dom/grid/test/chrome.ini b/dom/grid/test/chrome.ini deleted file mode 100644 index 6b4dc733b01a..000000000000 --- a/dom/grid/test/chrome.ini +++ /dev/null @@ -1,11 +0,0 @@ -[chrome/test_grid_areas.html] -[chrome/test_grid_equality.html] -[chrome/test_grid_fragmentation.html] -[chrome/test_grid_implicit.html] -[chrome/test_grid_line_numbers.html] -[chrome/test_grid_lines.html] -[chrome/test_grid_object.html] -[chrome/test_grid_repeat_auto_fill.html] -[chrome/test_grid_repeat_auto_fit.html] -[chrome/test_grid_subtree_dirty.html] -[chrome/test_grid_tracks.html] diff --git a/dom/grid/test/chrome.toml b/dom/grid/test/chrome.toml new file mode 100644 index 000000000000..47aba99351a3 --- /dev/null +++ b/dom/grid/test/chrome.toml @@ -0,0 +1,23 @@ +[DEFAULT] + +["chrome/test_grid_areas.html"] + +["chrome/test_grid_equality.html"] + +["chrome/test_grid_fragmentation.html"] + +["chrome/test_grid_implicit.html"] + +["chrome/test_grid_line_numbers.html"] + +["chrome/test_grid_lines.html"] + +["chrome/test_grid_object.html"] + +["chrome/test_grid_repeat_auto_fill.html"] + +["chrome/test_grid_repeat_auto_fit.html"] + +["chrome/test_grid_subtree_dirty.html"] + +["chrome/test_grid_tracks.html"] diff --git a/dom/html/moz.build b/dom/html/moz.build index bb87e0f068b2..4ef152309bb9 100644 --- a/dom/html/moz.build +++ b/dom/html/moz.build @@ -17,8 +17,8 @@ MOCHITEST_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "test/chrome.ini", - "test/forms/chrome.ini", + "test/chrome.toml", + "test/forms/chrome.toml", ] BROWSER_CHROME_MANIFESTS += ["test/browser.ini"] diff --git a/dom/html/test/chrome.ini b/dom/html/test/chrome.ini deleted file mode 100644 index ec7f9d1fb557..000000000000 --- a/dom/html/test/chrome.ini +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -support-files = - file_anchor_ping.html - image.png - -[test_anchor_ping.html] -skip-if = os == 'android' -[test_bug1414077.html] -[test_external_protocol_iframe.html] diff --git a/dom/html/test/chrome.toml b/dom/html/test/chrome.toml new file mode 100644 index 000000000000..ac226b51c262 --- /dev/null +++ b/dom/html/test/chrome.toml @@ -0,0 +1,12 @@ +[DEFAULT] +support-files = [ + "file_anchor_ping.html", + "image.png", +] + +["test_anchor_ping.html"] +skip-if = ["os == 'android'"] + +["test_bug1414077.html"] + +["test_external_protocol_iframe.html"] diff --git a/dom/html/test/forms/chrome.ini b/dom/html/test/forms/chrome.ini deleted file mode 100644 index 0c8fa82314cd..000000000000 --- a/dom/html/test/forms/chrome.ini +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -support-files = - submit_invalid_file.sjs -[test_autocompleteinfo.html] -[test_submit_invalid_file.html] diff --git a/dom/html/test/forms/chrome.toml b/dom/html/test/forms/chrome.toml new file mode 100644 index 000000000000..0f49518b9b65 --- /dev/null +++ b/dom/html/test/forms/chrome.toml @@ -0,0 +1,6 @@ +[DEFAULT] +support-files = ["submit_invalid_file.sjs"] + +["test_autocompleteinfo.html"] + +["test_submit_invalid_file.html"] diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build index ca62d61ada8b..e49fe92f4901 100644 --- a/dom/indexedDB/moz.build +++ b/dom/indexedDB/moz.build @@ -15,7 +15,7 @@ MOCHITEST_MANIFESTS += [ BROWSER_CHROME_MANIFESTS += ["test/browser.ini"] -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += [ "test/unit/xpcshell-child-process.ini", diff --git a/dom/indexedDB/test/chrome.ini b/dom/indexedDB/test/chrome.ini deleted file mode 100644 index 9a426f4954f8..000000000000 --- a/dom/indexedDB/test/chrome.ini +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -support-files = chromeHelpers.js - -[test_globalObjects_chrome.xhtml] -[test_wrappedArray.xhtml] diff --git a/dom/indexedDB/test/chrome.toml b/dom/indexedDB/test/chrome.toml new file mode 100644 index 000000000000..77f0dd9fdd3f --- /dev/null +++ b/dom/indexedDB/test/chrome.toml @@ -0,0 +1,6 @@ +[DEFAULT] +support-files = ["chromeHelpers.js"] + +["test_globalObjects_chrome.xhtml"] + +["test_wrappedArray.xhtml"] diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build index df4a64db7716..d976a5745f3d 100644 --- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -266,7 +266,7 @@ BROWSER_CHROME_MANIFESTS += [ "tests/JSWindowActor/browser.ini", ] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.toml"] MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell.ini"] diff --git a/dom/ipc/tests/chrome.ini b/dom/ipc/tests/chrome.ini deleted file mode 100644 index 1f0bc2995445..000000000000 --- a/dom/ipc/tests/chrome.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - process_error.xhtml - -[test_process_error.xhtml] -skip-if = !crashreporter diff --git a/dom/ipc/tests/chrome.toml b/dom/ipc/tests/chrome.toml new file mode 100644 index 000000000000..79f3e2fb22ea --- /dev/null +++ b/dom/ipc/tests/chrome.toml @@ -0,0 +1,6 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = ["process_error.xhtml"] + +["test_process_error.xhtml"] +skip-if = ["!crashreporter"] diff --git a/dom/l10n/moz.build b/dom/l10n/moz.build index 0beb3d668e8e..8af3d57e11a1 100644 --- a/dom/l10n/moz.build +++ b/dom/l10n/moz.build @@ -28,7 +28,7 @@ LOCAL_INCLUDES += [ FINAL_LIBRARY = "xul" MOCHITEST_MANIFESTS += ["tests/mochitest/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/mochitest/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/mochitest/chrome.toml"] BROWSER_CHROME_MANIFESTS += ["tests/mochitest/browser.ini"] if CONFIG["ENABLE_TESTS"]: diff --git a/dom/l10n/tests/mochitest/chrome.ini b/dom/l10n/tests/mochitest/chrome.ini deleted file mode 100644 index 68f3d89d4000..000000000000 --- a/dom/l10n/tests/mochitest/chrome.ini +++ /dev/null @@ -1,47 +0,0 @@ -[l10n_overlays/test_attributes.html] -[l10n_overlays/test_functional_children.html] -[l10n_overlays/test_text_children.html] -[l10n_overlays/test_extra_text_markup.html] -[l10n_overlays/test_l10n_overlays.xhtml] -[l10n_overlays/test_same_id.html] -[l10n_overlays/test_same_id_args.html] -[l10n_overlays/test_title.html] - -[l10n_mutations/test_append_content_post_dcl.html] -[l10n_mutations/test_append_content_pre_dcl.html] -[l10n_mutations/test_append_fragment_post_dcl.html] -[l10n_mutations/test_disconnectedRoot_webcomponent.html] -[l10n_mutations/test_set_attributes.html] -[l10n_mutations/test_pause_observing.html] -[l10n_mutations/test_template.html] -[l10n_mutations/test_remove_element.html] -[l10n_mutations/test_remove_fragment.html] - -[dom_localization/test_attr_sanitized.html] -[dom_localization/test_getAttributes.html] -[dom_localization/test_setAttributes.html] -[dom_localization/test_translateElements.html] -[dom_localization/test_translateFragment.html] -[dom_localization/test_connectRoot.html] -[dom_localization/test_connectRoot_webcomponent.html] -[dom_localization/test_disconnectRoot.html] -[dom_localization/test_repeated_l10nid.html] -[dom_localization/test_translateRoots.html] -[dom_localization/test_l10n_mutations.html] -[dom_localization/test_overlay.html] -[dom_localization/test_overlay_repeated.html] -[dom_localization/test_overlay_missing_all.html] -[dom_localization/test_overlay_missing_children.html] -[dom_localization/test_overlay_sanitized.html] -[dom_localization/test_domloc.xhtml] - - -[document_l10n/test_docl10n.xhtml] -[document_l10n/test_docl10n.html] -[document_l10n/test_docl10n_sync.html] -[document_l10n/test_docl10n_ready_rejected.html] -[document_l10n/test_docl10n_removeResourceIds.html] -[document_l10n/test_docl10n_lazy.html] -[document_l10n/test_connectRoot_webcomponent.html] -[document_l10n/test_connectRoot_webcomponent_lazy.html] -[document_l10n/test_telemetry.html] diff --git a/dom/l10n/tests/mochitest/chrome.toml b/dom/l10n/tests/mochitest/chrome.toml new file mode 100644 index 000000000000..2acf40e10d2c --- /dev/null +++ b/dom/l10n/tests/mochitest/chrome.toml @@ -0,0 +1,87 @@ +[DEFAULT] + +["document_l10n/test_connectRoot_webcomponent.html"] + +["document_l10n/test_connectRoot_webcomponent_lazy.html"] + +["document_l10n/test_docl10n.html"] + +["document_l10n/test_docl10n.xhtml"] + +["document_l10n/test_docl10n_lazy.html"] + +["document_l10n/test_docl10n_ready_rejected.html"] + +["document_l10n/test_docl10n_removeResourceIds.html"] + +["document_l10n/test_docl10n_sync.html"] + +["document_l10n/test_telemetry.html"] + +["dom_localization/test_attr_sanitized.html"] + +["dom_localization/test_connectRoot.html"] + +["dom_localization/test_connectRoot_webcomponent.html"] + +["dom_localization/test_disconnectRoot.html"] + +["dom_localization/test_domloc.xhtml"] + +["dom_localization/test_getAttributes.html"] + +["dom_localization/test_l10n_mutations.html"] + +["dom_localization/test_overlay.html"] + +["dom_localization/test_overlay_missing_all.html"] + +["dom_localization/test_overlay_missing_children.html"] + +["dom_localization/test_overlay_repeated.html"] + +["dom_localization/test_overlay_sanitized.html"] + +["dom_localization/test_repeated_l10nid.html"] + +["dom_localization/test_setAttributes.html"] + +["dom_localization/test_translateElements.html"] + +["dom_localization/test_translateFragment.html"] + +["dom_localization/test_translateRoots.html"] + +["l10n_mutations/test_append_content_post_dcl.html"] + +["l10n_mutations/test_append_content_pre_dcl.html"] + +["l10n_mutations/test_append_fragment_post_dcl.html"] + +["l10n_mutations/test_disconnectedRoot_webcomponent.html"] + +["l10n_mutations/test_pause_observing.html"] + +["l10n_mutations/test_remove_element.html"] + +["l10n_mutations/test_remove_fragment.html"] + +["l10n_mutations/test_set_attributes.html"] + +["l10n_mutations/test_template.html"] + +["l10n_overlays/test_attributes.html"] + +["l10n_overlays/test_extra_text_markup.html"] + +["l10n_overlays/test_functional_children.html"] + +["l10n_overlays/test_l10n_overlays.xhtml"] + +["l10n_overlays/test_same_id.html"] + +["l10n_overlays/test_same_id_args.html"] + +["l10n_overlays/test_text_children.html"] + +["l10n_overlays/test_title.html"] diff --git a/dom/media/moz.build b/dom/media/moz.build index b52df9a0bc13..d66f0429ec56 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -91,7 +91,7 @@ MOCHITEST_MANIFESTS += [ "webrtc/tests/mochitests/identity/mochitest.ini", ] -MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.toml"] BROWSER_CHROME_MANIFESTS += [ "mediacontrol/tests/browser/browser.ini", diff --git a/dom/media/test/chrome/chrome.ini b/dom/media/test/chrome/chrome.ini deleted file mode 100644 index c6969d0bc5fc..000000000000 --- a/dom/media/test/chrome/chrome.ini +++ /dev/null @@ -1,10 +0,0 @@ -[DEFAULT] -subsuite = media -support-files = - ../gizmo.mp4 - ../gizmo-noaudio.mp4 - ../TestPatternHDR.mp4 - ../tone2s-silence4s-tone2s.opus - -[test_accumulated_play_time.html] -[test_telemetry_source_buffer_type.html] diff --git a/dom/media/test/chrome/chrome.toml b/dom/media/test/chrome/chrome.toml new file mode 100644 index 000000000000..57d18438419d --- /dev/null +++ b/dom/media/test/chrome/chrome.toml @@ -0,0 +1,12 @@ +[DEFAULT] +subsuite = "media" +support-files = [ + "../gizmo.mp4", + "../gizmo-noaudio.mp4", + "../TestPatternHDR.mp4", + "../tone2s-silence4s-tone2s.opus", +] + +["test_accumulated_play_time.html"] + +["test_telemetry_source_buffer_type.html"] diff --git a/dom/messagechannel/tests/chrome.ini b/dom/messagechannel/tests/chrome.ini deleted file mode 100644 index 9ec2edcb4d80..000000000000 --- a/dom/messagechannel/tests/chrome.ini +++ /dev/null @@ -1,12 +0,0 @@ -[DEFAULT] -support-files = - iframe_messageChannel_chrome.html - mm_messageChannelParent.xhtml - mm_messageChannelParentNotRemote.xhtml - mm_messageChannelParent.js - mm_messageChannel.js - -[test_messageChannel.xhtml] -[test_messageChannelWithMessageManager.xhtml] -skip-if = os == 'android' -[test_messageChannelWithMessageManagerNotRemote.xhtml] diff --git a/dom/messagechannel/tests/chrome.toml b/dom/messagechannel/tests/chrome.toml new file mode 100644 index 000000000000..b66ebfbfd34d --- /dev/null +++ b/dom/messagechannel/tests/chrome.toml @@ -0,0 +1,15 @@ +[DEFAULT] +support-files = [ + "iframe_messageChannel_chrome.html", + "mm_messageChannelParent.xhtml", + "mm_messageChannelParentNotRemote.xhtml", + "mm_messageChannelParent.js", + "mm_messageChannel.js", +] + +["test_messageChannel.xhtml"] + +["test_messageChannelWithMessageManager.xhtml"] +skip-if = ["os == 'android'"] + +["test_messageChannelWithMessageManagerNotRemote.xhtml"] diff --git a/dom/messagechannel/tests/moz.build b/dom/messagechannel/tests/moz.build index 6cf89eae3b7a..e5dd2e4c10fe 100644 --- a/dom/messagechannel/tests/moz.build +++ b/dom/messagechannel/tests/moz.build @@ -5,6 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. MOCHITEST_MANIFESTS += ["mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["unit/xpcshell.ini"] diff --git a/dom/network/moz.build b/dom/network/moz.build index c99c91cc1cfb..ba152063208b 100644 --- a/dom/network/moz.build +++ b/dom/network/moz.build @@ -9,7 +9,7 @@ with Files("**"): DIRS += ["interfaces"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.toml"] MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] EXPORTS.mozilla.dom += [ diff --git a/dom/network/tests/chrome.ini b/dom/network/tests/chrome.ini deleted file mode 100644 index a0b6c2ae3fc2..000000000000 --- a/dom/network/tests/chrome.ini +++ /dev/null @@ -1,11 +0,0 @@ -[DEFAULT] -support-files = - tcpsocket_test.sys.mjs - test_tcpsocket_client_and_server_basics.js - file_postMessage_opener.html - file_udpsocket_iframe.html - -[test_tcpsocket_jsm.html] -[test_tcpsocket_client_and_server_basics.html] -[test_tcpsocket_legacy.html] -[test_udpsocket.html] diff --git a/dom/network/tests/chrome.toml b/dom/network/tests/chrome.toml new file mode 100644 index 000000000000..c22fe3857226 --- /dev/null +++ b/dom/network/tests/chrome.toml @@ -0,0 +1,15 @@ +[DEFAULT] +support-files = [ + "tcpsocket_test.sys.mjs", + "test_tcpsocket_client_and_server_basics.js", + "file_postMessage_opener.html", + "file_udpsocket_iframe.html", +] + +["test_tcpsocket_client_and_server_basics.html"] + +["test_tcpsocket_jsm.html"] + +["test_tcpsocket_legacy.html"] + +["test_udpsocket.html"] diff --git a/dom/notification/moz.build b/dom/notification/moz.build index 77c0991cbe3f..fd46c24e338e 100644 --- a/dom/notification/moz.build +++ b/dom/notification/moz.build @@ -36,7 +36,7 @@ LOCAL_INCLUDES += [ BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"] XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] MOCHITEST_MANIFESTS += ["test/mochitest/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.toml"] if CONFIG["MOZ_NEW_NOTIFICATION_STORE"]: EXTRA_JS_MODULES += [ diff --git a/dom/notification/test/chrome/chrome.ini b/dom/notification/test/chrome/chrome.ini deleted file mode 100644 index 78f68ab8e82c..000000000000 --- a/dom/notification/test/chrome/chrome.ini +++ /dev/null @@ -1 +0,0 @@ -[test_notification_system_principal.xhtml] \ No newline at end of file diff --git a/dom/notification/test/chrome/chrome.toml b/dom/notification/test/chrome/chrome.toml new file mode 100644 index 000000000000..d4027438d257 --- /dev/null +++ b/dom/notification/test/chrome/chrome.toml @@ -0,0 +1,3 @@ +[DEFAULT] + +["test_notification_system_principal.xhtml"] diff --git a/dom/promise/moz.build b/dom/promise/moz.build index c317f1fae080..ef273fd3fc4f 100644 --- a/dom/promise/moz.build +++ b/dom/promise/moz.build @@ -37,6 +37,6 @@ FINAL_LIBRARY = "xul" MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"] diff --git a/dom/promise/tests/chrome.ini b/dom/promise/tests/chrome.ini deleted file mode 100644 index 1df9608c38a9..000000000000 --- a/dom/promise/tests/chrome.ini +++ /dev/null @@ -1,15 +0,0 @@ -[DEFAULT] - -[test_on_new_promise.html] -[test_on_promise_settled.html] -[test_on_promise_settled_duplicates.html] -[test_promise_xrays.html] -support-files = file_promise_xrays.html -[test_promise_argument_xrays.html] -support-files = file_promise_xrays.html file_promise_argument_tests.js -skip-if = debug == false -[test_promise_retval_xrays.html] -support-files = file_promise_xrays.html file_promise_retval_tests.js -skip-if = debug == false -[test_promise_job_with_bind_from_discarded_iframe.html] -support-files = file_promise_job_with_bind_from_discarded_iframe.html diff --git a/dom/promise/tests/chrome.toml b/dom/promise/tests/chrome.toml new file mode 100644 index 000000000000..9b85c2de6933 --- /dev/null +++ b/dom/promise/tests/chrome.toml @@ -0,0 +1,27 @@ +[DEFAULT] + +["test_on_new_promise.html"] + +["test_on_promise_settled.html"] + +["test_on_promise_settled_duplicates.html"] + +["test_promise_argument_xrays.html"] +support-files = [ + "file_promise_xrays.html", + "file_promise_argument_tests.js", +] +skip-if = ["!debug"] + +["test_promise_job_with_bind_from_discarded_iframe.html"] +support-files = ["file_promise_job_with_bind_from_discarded_iframe.html"] + +["test_promise_retval_xrays.html"] +support-files = [ + "file_promise_xrays.html", + "file_promise_retval_tests.js" +] +skip-if = ["debug == false"] + +["test_promise_xrays.html"] +support-files = ["file_promise_xrays.html"] diff --git a/dom/prototype/moz.build b/dom/prototype/moz.build index f73b3824ac93..becc0b5b1e98 100644 --- a/dom/prototype/moz.build +++ b/dom/prototype/moz.build @@ -20,6 +20,6 @@ LOCAL_INCLUDES += [ "/dom/xul", ] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] FINAL_LIBRARY = "xul" diff --git a/dom/prototype/tests/chrome/chrome.ini b/dom/prototype/tests/chrome/chrome.ini deleted file mode 100644 index 8de4e4bfb56b..000000000000 --- a/dom/prototype/tests/chrome/chrome.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -support-files = - whitespace.xhtml - no_whitespace.xhtml - form.xhtml - -[test_prototype_document.xhtml] diff --git a/dom/prototype/tests/chrome/chrome.toml b/dom/prototype/tests/chrome/chrome.toml new file mode 100644 index 000000000000..1c69aae439ba --- /dev/null +++ b/dom/prototype/tests/chrome/chrome.toml @@ -0,0 +1,8 @@ +[DEFAULT] +support-files = [ + "whitespace.xhtml", + "no_whitespace.xhtml", + "form.xhtml", +] + +["test_prototype_document.xhtml"] diff --git a/dom/security/test/general/chrome.ini b/dom/security/test/general/chrome.ini deleted file mode 100644 index 35d7e44d8954..000000000000 --- a/dom/security/test/general/chrome.ini +++ /dev/null @@ -1,11 +0,0 @@ -[DEFAULT] -support-files = - favicon_bug1277803.ico - bug1277803.html - -[test_innerhtml_sanitizer.html] -[test_innerhtml_sanitizer.xhtml] -[test_bug1277803.xhtml] -skip-if = os == 'android' - verify - diff --git a/dom/security/test/general/chrome.toml b/dom/security/test/general/chrome.toml new file mode 100644 index 000000000000..88feda944bc5 --- /dev/null +++ b/dom/security/test/general/chrome.toml @@ -0,0 +1,15 @@ +[DEFAULT] +support-files = [ + "favicon_bug1277803.ico", + "bug1277803.html", +] + +["test_bug1277803.xhtml"] +skip-if = [ + "os == 'android'", + "verify", +] + +["test_innerhtml_sanitizer.html"] + +["test_innerhtml_sanitizer.xhtml"] diff --git a/dom/security/test/moz.build b/dom/security/test/moz.build index 7ea212749040..599fee23a9b7 100644 --- a/dom/security/test/moz.build +++ b/dom/security/test/moz.build @@ -28,7 +28,7 @@ MOCHITEST_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "general/chrome.ini", + "general/chrome.toml", ] BROWSER_CHROME_MANIFESTS += [ diff --git a/dom/serviceworkers/moz.build b/dom/serviceworkers/moz.build index c47bb8f74fa6..d8792b96a88b 100644 --- a/dom/serviceworkers/moz.build +++ b/dom/serviceworkers/moz.build @@ -117,8 +117,8 @@ MOCHITEST_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "test/chrome-dFPI.ini", - "test/chrome.ini", + "test/chrome-dFPI.toml", + "test/chrome.toml", ] BROWSER_CHROME_MANIFESTS += [ diff --git a/dom/serviceworkers/test/chrome-common.ini b/dom/serviceworkers/test/chrome-common.ini deleted file mode 100644 index b5cae318e183..000000000000 --- a/dom/serviceworkers/test/chrome-common.ini +++ /dev/null @@ -1,21 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - chrome_helpers.js - empty.js - fetch.js - hello.html - serviceworker.html - serviceworkerinfo_iframe.html - serviceworkermanager_iframe.html - serviceworkerregistrationinfo_iframe.html - utils.js - worker.js - worker2.js - -[test_devtools_track_serviceworker_time.html] -[test_privateBrowsing.html] -[test_serviceworkerinfo.xhtml] -skip-if = serviceworker_e10s # nsIWorkerDebugger attribute not implemented -[test_serviceworkermanager.xhtml] -[test_serviceworkerregistrationinfo.xhtml] diff --git a/dom/serviceworkers/test/chrome-common.toml b/dom/serviceworkers/test/chrome-common.toml new file mode 100644 index 000000000000..e486456d11fc --- /dev/null +++ b/dom/serviceworkers/test/chrome-common.toml @@ -0,0 +1,26 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "chrome_helpers.js", + "empty.js", + "fetch.js", + "hello.html", + "serviceworker.html", + "serviceworkerinfo_iframe.html", + "serviceworkermanager_iframe.html", + "serviceworkerregistrationinfo_iframe.html", + "utils.js", + "worker.js", + "worker2.js", +] + +["test_devtools_track_serviceworker_time.html"] + +["test_privateBrowsing.html"] + +["test_serviceworkerinfo.xhtml"] +skip-if = ["serviceworker_e10s"] # nsIWorkerDebugger attribute not implemented + +["test_serviceworkermanager.xhtml"] + +["test_serviceworkerregistrationinfo.xhtml"] diff --git a/dom/serviceworkers/test/chrome-dFPI.ini b/dom/serviceworkers/test/chrome-dFPI.toml similarity index 54% rename from dom/serviceworkers/test/chrome-dFPI.ini rename to dom/serviceworkers/test/chrome-dFPI.toml index b07337f7531b..1aee0a219f49 100644 --- a/dom/serviceworkers/test/chrome-dFPI.ini +++ b/dom/serviceworkers/test/chrome-dFPI.toml @@ -1,7 +1,6 @@ [DEFAULT] # Enable dFPI(cookieBehavior 5) for service worker tests. -prefs = - network.cookie.cookieBehavior=5 +prefs = ["network.cookie.cookieBehavior=5"] dupe-manifest = true -[include:chrome-common.ini] +["include:chrome-common.toml"] diff --git a/dom/serviceworkers/test/chrome.ini b/dom/serviceworkers/test/chrome.toml similarity index 50% rename from dom/serviceworkers/test/chrome.ini rename to dom/serviceworkers/test/chrome.toml index e6f7e3206d27..02efcc145dd9 100644 --- a/dom/serviceworkers/test/chrome.ini +++ b/dom/serviceworkers/test/chrome.toml @@ -1,4 +1,4 @@ [DEFAULT] dupe-manifest = true -[include:chrome-common.ini] +["include:chrome-common.toml"] diff --git a/dom/system/moz.build b/dom/system/moz.build index 4f921ab7efe0..0afa014f932b 100644 --- a/dom/system/moz.build +++ b/dom/system/moz.build @@ -32,7 +32,7 @@ with Files("linux/*LocationProvider*"): with Files("android/*LocationProvider*"): BUG_COMPONENT = ("Core", "DOM: Geolocation") -with Files("tests/chrome.ini"): +with Files("tests/chrome.toml"): BUG_COMPONENT = ("Toolkit", "IOUtils and PathUtils") with Files("tests/*constants*"): @@ -109,5 +109,5 @@ LOCAL_INCLUDES += [ "/xpcom/base", ] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini", "tests/ioutils/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.toml", "tests/ioutils/chrome.toml"] MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] diff --git a/dom/system/tests/chrome.ini b/dom/system/tests/chrome.ini deleted file mode 100644 index 54bdcbb421a5..000000000000 --- a/dom/system/tests/chrome.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] - -[test_pathutils.html] -[test_pathutils_worker.xhtml] -support-files = - pathutils_worker.js diff --git a/dom/system/tests/chrome.toml b/dom/system/tests/chrome.toml new file mode 100644 index 000000000000..87f782b4659f --- /dev/null +++ b/dom/system/tests/chrome.toml @@ -0,0 +1,6 @@ +[DEFAULT] + +["test_pathutils.html"] + +["test_pathutils_worker.xhtml"] +support-files = ["pathutils_worker.js"] diff --git a/dom/system/tests/ioutils/chrome.ini b/dom/system/tests/ioutils/chrome.ini deleted file mode 100644 index a961f45631e2..000000000000 --- a/dom/system/tests/ioutils/chrome.ini +++ /dev/null @@ -1,23 +0,0 @@ -[DEFAULT] -support-files = - file_ioutils_test_fixtures.js - file_ioutils_worker.js - -[test_ioutils.html] -[test_ioutils_compute_hex_digest.html] -[test_ioutils_copy_move.html] -[test_ioutils_create_unique.html] -[test_ioutils_dir_iteration.html] -[test_ioutils_getfile.html] -[test_ioutils_mac_xattr.html] -skip-if = (os != "mac") -[test_ioutils_mkdir.html] -[test_ioutils_read_write.html] -[test_ioutils_read_write_json.html] -[test_ioutils_read_write_utf8.html] -[test_ioutils_remove.html] -[test_ioutils_stat_set_modification_time.html] -[test_ioutils_worker.xhtml] -[test_ioutils_set_permissions.html] -[test_ioutils_windows_file_attributes.html] -skip-if = (os != 'win') diff --git a/dom/system/tests/ioutils/chrome.toml b/dom/system/tests/ioutils/chrome.toml new file mode 100644 index 000000000000..16434b5bb62e --- /dev/null +++ b/dom/system/tests/ioutils/chrome.toml @@ -0,0 +1,39 @@ +[DEFAULT] +support-files = [ + "file_ioutils_test_fixtures.js", + "file_ioutils_worker.js", +] + +["test_ioutils.html"] + +["test_ioutils_compute_hex_digest.html"] + +["test_ioutils_copy_move.html"] + +["test_ioutils_create_unique.html"] + +["test_ioutils_dir_iteration.html"] + +["test_ioutils_getfile.html"] + +["test_ioutils_mac_xattr.html"] +skip-if = ["(os != 'mac')"] + +["test_ioutils_mkdir.html"] + +["test_ioutils_read_write.html"] + +["test_ioutils_read_write_json.html"] + +["test_ioutils_read_write_utf8.html"] + +["test_ioutils_remove.html"] + +["test_ioutils_set_permissions.html"] + +["test_ioutils_stat_set_modification_time.html"] + +["test_ioutils_windows_file_attributes.html"] +skip-if = ["(os != 'win')"] + +["test_ioutils_worker.xhtml"] diff --git a/dom/tests/mochitest/beacon/chrome.ini b/dom/tests/mochitest/beacon/chrome.ini deleted file mode 100644 index 27f8f939520b..000000000000 --- a/dom/tests/mochitest/beacon/chrome.ini +++ /dev/null @@ -1,10 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' - -[test_beaconCookies.html] -skip-if = (verify && !debug && (os == 'win')) -support-files = beacon-set-cookie.sjs - file_beaconCookies.html -[test_beaconWithSafelistedContentType.html] -support-files = beacon-handler.sjs - file_beaconSafelist.html diff --git a/dom/tests/mochitest/beacon/chrome.toml b/dom/tests/mochitest/beacon/chrome.toml new file mode 100644 index 000000000000..92a95b05150e --- /dev/null +++ b/dom/tests/mochitest/beacon/chrome.toml @@ -0,0 +1,15 @@ +[DEFAULT] +skip-if = ["os == 'android'"] + +["test_beaconCookies.html"] +skip-if = ["(verify && !debug && (os == 'win'))"] +support-files = [ + "beacon-set-cookie.sjs", + "file_beaconCookies.html", +] + +["test_beaconWithSafelistedContentType.html"] +support-files = [ + "beacon-handler.sjs", + "file_beaconSafelist.html", +] diff --git a/dom/tests/mochitest/chrome/chrome.ini b/dom/tests/mochitest/chrome/chrome.ini deleted file mode 100644 index 098d49a49b22..000000000000 --- a/dom/tests/mochitest/chrome/chrome.ini +++ /dev/null @@ -1,91 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - 489127.html - DOMWindowCreated_chrome.xhtml - DOMWindowCreated_content.html - child_focus_frame.html - file_clipboard_events_chrome.html - file_DOM_element_instanceof.xhtml - file_bug800817.xhtml - file_bug830858.xhtml - file_bug1224790-1_modal.xhtml - file_bug1224790-1_nonmodal.xhtml - file_bug1224790-2_modal.xhtml - file_bug1224790-2_nonmodal.xhtml - file_popup_blocker_chrome.html - file_subscript_bindings.js - focus_frameset.html - focus_window2.xhtml - focus_dialog.xhtml - queryCaretRectUnix.html - queryCaretRectWin.html - selectAtPoint.html - selectAtPoint-innerframe.html - sizemode_attribute.xhtml - window_activation.xhtml - window_callback_wrapping.xhtml - window_docshell_swap.xhtml - window_focus.xhtml - window_focus_inner.xhtml - window_focus_docnav.xhtml - !/dom/tests/mochitest/general/file_clonewrapper.html - !/dom/tests/mochitest/general/file_moving_nodeList.html - !/dom/tests/mochitest/general/file_moving_xhr.html - !/dom/tests/mochitest/geolocation/network_geolocation.sjs - -[test_DOMWindowCreated.xhtml] -[test_DOM_element_instanceof.xhtml] -[test_activation.xhtml] -tags = fullscreen -[test_bug800817.xhtml] -[test_bug830858.xhtml] -[test_bug1224790-1.xhtml] -tags = openwindow -skip-if = os != 'mac' -[test_bug1224790-2.xhtml] -tags = openwindow -skip-if = os != 'mac' -[test_callback_wrapping.xhtml] -[test_clonewrapper.xhtml] -[test_cyclecollector.xhtml] -[test_docshell_swap.xhtml] -[test_elements_proto.xhtml] -[test_focus.xhtml] -skip-if = - os == 'linux' # bug 1296622, Bug 1605253 - os == "mac" && !debug # Bug 1828622 - os == "win" && !debug # Bug 1828622 -[test_focus_dialog.xhtml] -[test_focus_docnav.xhtml] -[test_focused_link_scroll.xhtml] -[test_geolocation.xhtml] -[test_getTransformTo.html] -[test_indexedSetter.html] -[test_intlUtils_getDisplayNames.html] -[test_intlUtils_isAppLocaleRTL.html] -[test_moving_nodeList.xhtml] -[test_moving_xhr.xhtml] -[test_nodesFromPoint.html] -[test_nodesFromRect.html] -[test_parsingMode.html] -[test_popup_blocker_chrome.xhtml] -[test_queryCaretRect.html] -[test_resize_move_windows.xhtml] -support-files = - file_resize_move_windows_1.html - file_resize_move_windows_2.html -# disabled on linux for timeouts--bug-834716 -skip-if = os == 'linux' -[test_sandbox_bindings.xhtml] -[test_sandbox_eventhandler.xhtml] -[test_sandbox_image.xhtml] -[test_sandbox_postMessage.html] -[test_selectAtPoint.html] -[test_sizemode_attribute.xhtml] -tags = fullscreen -skip-if = os != 'win' -[test_subscript_bindings.xhtml] -[test_xray_event_constructor.xhtml] -[test_clipboard_events_chrome.html] -[test_window_getRegionalPrefsLocales.html] diff --git a/dom/tests/mochitest/chrome/chrome.toml b/dom/tests/mochitest/chrome/chrome.toml new file mode 100644 index 000000000000..17a734da0e74 --- /dev/null +++ b/dom/tests/mochitest/chrome/chrome.toml @@ -0,0 +1,132 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "489127.html", + "DOMWindowCreated_chrome.xhtml", + "DOMWindowCreated_content.html", + "child_focus_frame.html", + "file_clipboard_events_chrome.html", + "file_DOM_element_instanceof.xhtml", + "file_bug800817.xhtml", + "file_bug830858.xhtml", + "file_bug1224790-1_modal.xhtml", + "file_bug1224790-1_nonmodal.xhtml", + "file_bug1224790-2_modal.xhtml", + "file_bug1224790-2_nonmodal.xhtml", + "file_popup_blocker_chrome.html", + "file_subscript_bindings.js", + "focus_frameset.html", + "focus_window2.xhtml", + "focus_dialog.xhtml", + "queryCaretRectUnix.html", + "queryCaretRectWin.html", + "selectAtPoint.html", + "selectAtPoint-innerframe.html", + "sizemode_attribute.xhtml", + "window_activation.xhtml", + "window_callback_wrapping.xhtml", + "window_docshell_swap.xhtml", + "window_focus.xhtml", + "window_focus_inner.xhtml", + "window_focus_docnav.xhtml", + "!/dom/tests/mochitest/general/file_clonewrapper.html", + "!/dom/tests/mochitest/general/file_moving_nodeList.html", + "!/dom/tests/mochitest/general/file_moving_xhr.html", + "!/dom/tests/mochitest/geolocation/network_geolocation.sjs", +] + +["test_DOMWindowCreated.xhtml"] + +["test_DOM_element_instanceof.xhtml"] + +["test_activation.xhtml"] +tags = "fullscreen" + +["test_bug1224790-1.xhtml"] +tags = "openwindow" +skip-if = ["os != 'mac'"] + +["test_bug1224790-2.xhtml"] +tags = "openwindow" +skip-if = ["os != 'mac'"] + +["test_bug800817.xhtml"] + +["test_bug830858.xhtml"] + +["test_callback_wrapping.xhtml"] + +["test_clipboard_events_chrome.html"] + +["test_clonewrapper.xhtml"] + +["test_cyclecollector.xhtml"] + +["test_docshell_swap.xhtml"] + +["test_elements_proto.xhtml"] + +["test_focus.xhtml"] +skip-if = [ + "os == 'linux'", # bug 1296622, Bug 1605253 + "os == 'mac' && !debug", # Bug 1828622 + "os == 'win' && !debug", # Bug 1828622 +] + +["test_focus_dialog.xhtml"] + +["test_focus_docnav.xhtml"] + +["test_focused_link_scroll.xhtml"] + +["test_geolocation.xhtml"] + +["test_getTransformTo.html"] + +["test_indexedSetter.html"] + +["test_intlUtils_getDisplayNames.html"] + +["test_intlUtils_isAppLocaleRTL.html"] + +["test_moving_nodeList.xhtml"] + +["test_moving_xhr.xhtml"] + +["test_nodesFromPoint.html"] + +["test_nodesFromRect.html"] + +["test_parsingMode.html"] + +["test_popup_blocker_chrome.xhtml"] + +["test_queryCaretRect.html"] + +["test_resize_move_windows.xhtml"] +support-files = [ + "file_resize_move_windows_1.html", + "file_resize_move_windows_2.html", +] +# disabled on linux for timeouts--bug-834716 +skip-if = ["os == 'linux'"] + +["test_sandbox_bindings.xhtml"] + +["test_sandbox_eventhandler.xhtml"] + +["test_sandbox_image.xhtml"] + +["test_sandbox_postMessage.html"] + +["test_selectAtPoint.html"] + +["test_sizemode_attribute.xhtml"] +tags = "fullscreen" +skip-if = ["os != 'win'"] + +["test_subscript_bindings.xhtml"] + +["test_window_getRegionalPrefsLocales.html"] + +["test_xray_event_constructor.xhtml"] diff --git a/dom/tests/mochitest/fs/chrome.ini b/dom/tests/mochitest/fs/chrome.ini deleted file mode 100644 index 6e0fd9f922e4..000000000000 --- a/dom/tests/mochitest/fs/chrome.ini +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -support-files = - page_blank.html - -[test_privateWin.html] diff --git a/dom/tests/mochitest/fs/chrome.toml b/dom/tests/mochitest/fs/chrome.toml new file mode 100644 index 000000000000..a1732a4962fc --- /dev/null +++ b/dom/tests/mochitest/fs/chrome.toml @@ -0,0 +1,4 @@ +[DEFAULT] +support-files = "page_blank.html" + +["test_privateWin.html"] diff --git a/dom/tests/mochitest/general/chrome.ini b/dom/tests/mochitest/general/chrome.ini deleted file mode 100644 index 9910eb7a9b0d..000000000000 --- a/dom/tests/mochitest/general/chrome.ini +++ /dev/null @@ -1,12 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' - -[test_innerScreen.xhtml] -[test_offsets.xhtml] -support-files = test_offsets.css test_offsets.js -skip-if = (os == "mac" && debug) #leaks Bug 1571583 -[test_spacetopagedown.html] -[test_nodeAdoption_chrome_boundary.xhtml] -[test_focusrings.xhtml] -support-files = file_focusrings.html -skip-if = toolkit == 'android' #TIMED_OUT diff --git a/dom/tests/mochitest/general/chrome.toml b/dom/tests/mochitest/general/chrome.toml new file mode 100644 index 000000000000..d2e0384619e9 --- /dev/null +++ b/dom/tests/mochitest/general/chrome.toml @@ -0,0 +1,19 @@ +[DEFAULT] +skip-if = ["os == 'android'"] + +["test_focusrings.xhtml"] +support-files = ["file_focusrings.html"] +skip-if = ["toolkit == 'android'"] #TIMED_OUT + +["test_innerScreen.xhtml"] + +["test_nodeAdoption_chrome_boundary.xhtml"] + +["test_offsets.xhtml"] +support-files = [ + "test_offsets.css", + "test_offsets.js", +] +skip-if = ["(os == 'mac' && debug)"] #leaks Bug 1571583 + +["test_spacetopagedown.html"] diff --git a/dom/tests/mochitest/geolocation/chrome.ini b/dom/tests/mochitest/geolocation/chrome.ini deleted file mode 100644 index 1922074f178d..000000000000 --- a/dom/tests/mochitest/geolocation/chrome.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -support-files = - geolocation_common.js - network_geolocation.sjs - -[test_handlerSpinsEventLoop.html] diff --git a/dom/tests/mochitest/geolocation/chrome.toml b/dom/tests/mochitest/geolocation/chrome.toml new file mode 100644 index 000000000000..e392ab203e16 --- /dev/null +++ b/dom/tests/mochitest/geolocation/chrome.toml @@ -0,0 +1,7 @@ +[DEFAULT] +support-files = [ + "geolocation_common.js", + "network_geolocation.sjs", +] + +["test_handlerSpinsEventLoop.html"] diff --git a/dom/tests/mochitest/keyhandling/chrome.ini b/dom/tests/mochitest/keyhandling/chrome.ini deleted file mode 100644 index 4199d5077da8..000000000000 --- a/dom/tests/mochitest/keyhandling/chrome.ini +++ /dev/null @@ -1,19 +0,0 @@ -[DEFAULT] -# test_input.html and test_textarea.html are also used as mochitests, hence -# we have to flip the skip assertion flag for the chrome tests here. -prefs = - dom.security.skip_remote_script_assertion_in_system_priv_context=true - -# nsIWidget::SynthesizeNativeKeyEvent() required (Bug 1410525 for headless) -skip-if = os == 'linux' - os == 'android' - headless - -[test_browser.xhtml] -support-files = - browsertest.html -[test_editor.xhtml] -[test_windowed.xhtml] -support-files = - test_input.html - test_textarea.html diff --git a/dom/tests/mochitest/keyhandling/chrome.toml b/dom/tests/mochitest/keyhandling/chrome.toml new file mode 100644 index 000000000000..5dbecb79792c --- /dev/null +++ b/dom/tests/mochitest/keyhandling/chrome.toml @@ -0,0 +1,22 @@ +[DEFAULT] +# test_input.html and test_textarea.html are also used as mochitests, hence +# we have to flip the skip assertion flag for the chrome tests here. +prefs = ["dom.security.skip_remote_script_assertion_in_system_priv_context=true"] + +# nsIWidget::SynthesizeNativeKeyEvent() required (Bug 1410525 for headless) +skip-if = [ + "os == 'linux'", + "os == 'android'", + "headless", +] + +["test_browser.xhtml"] +support-files = ["browsertest.html"] + +["test_editor.xhtml"] + +["test_windowed.xhtml"] +support-files = [ + "test_input.html", + "test_textarea.html", +] diff --git a/dom/tests/mochitest/localstorage/chrome.ini b/dom/tests/mochitest/localstorage/chrome.ini deleted file mode 100644 index 6cc5562c00c9..000000000000 --- a/dom/tests/mochitest/localstorage/chrome.ini +++ /dev/null @@ -1,11 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - page_blank.html - frameQuota.html - interOriginFrame.js - -[test_localStorageBasePrivateBrowsing_perwindowpb.html] -skip-if = true # bug 1156725 -[test_localStorageFromChrome.xhtml] -[test_localStorageQuotaPrivateBrowsing_perwindowpb.html] diff --git a/dom/tests/mochitest/localstorage/chrome.toml b/dom/tests/mochitest/localstorage/chrome.toml new file mode 100644 index 000000000000..4ce54b42a3ce --- /dev/null +++ b/dom/tests/mochitest/localstorage/chrome.toml @@ -0,0 +1,14 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "page_blank.html", + "frameQuota.html", + "interOriginFrame.js", +] + +["test_localStorageBasePrivateBrowsing_perwindowpb.html"] +skip-if = ["true"] # bug 1156725 + +["test_localStorageFromChrome.xhtml"] + +["test_localStorageQuotaPrivateBrowsing_perwindowpb.html"] diff --git a/dom/tests/mochitest/sessionstorage/chrome.ini b/dom/tests/mochitest/sessionstorage/chrome.ini deleted file mode 100644 index 65112f0f8241..000000000000 --- a/dom/tests/mochitest/sessionstorage/chrome.ini +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] - -[test_sessionStorageFromChrome.xhtml] diff --git a/dom/tests/mochitest/sessionstorage/chrome.toml b/dom/tests/mochitest/sessionstorage/chrome.toml new file mode 100644 index 000000000000..d08aa439739a --- /dev/null +++ b/dom/tests/mochitest/sessionstorage/chrome.toml @@ -0,0 +1,3 @@ +[DEFAULT] + +["test_sessionStorageFromChrome.xhtml"] diff --git a/dom/tests/mochitest/webcomponents/chrome.ini b/dom/tests/mochitest/webcomponents/chrome.ini deleted file mode 100644 index 8f54af95e3d4..000000000000 --- a/dom/tests/mochitest/webcomponents/chrome.ini +++ /dev/null @@ -1,17 +0,0 @@ -[DEFAULT] -support-files = - dummy_page.html - -[test_custom_element_ensure_custom_element.html] -[test_custom_element_htmlconstructor_chrome.html] -support-files = - htmlconstructor_autonomous_tests.js - htmlconstructor_builtin_tests.js -[test_custom_element_namespace.html] -[test_custom_element_namespace.xhtml] -[test_custom_element_upgrade_chrome.html] -support-files = - test_upgrade_page.html - upgrade_tests.js -[test_xul_custom_element.xhtml] -[test_xul_shadowdom_accesskey.xhtml] diff --git a/dom/tests/mochitest/webcomponents/chrome.toml b/dom/tests/mochitest/webcomponents/chrome.toml new file mode 100644 index 000000000000..b29df619c419 --- /dev/null +++ b/dom/tests/mochitest/webcomponents/chrome.toml @@ -0,0 +1,24 @@ +[DEFAULT] +support-files = ["dummy_page.html"] + +["test_custom_element_ensure_custom_element.html"] + +["test_custom_element_htmlconstructor_chrome.html"] +support-files = [ + "htmlconstructor_autonomous_tests.js", + "htmlconstructor_builtin_tests.js", +] + +["test_custom_element_namespace.html"] + +["test_custom_element_namespace.xhtml"] + +["test_custom_element_upgrade_chrome.html"] +support-files = [ + "test_upgrade_page.html", + "upgrade_tests.js", +] + +["test_xul_custom_element.xhtml"] + +["test_xul_shadowdom_accesskey.xhtml"] diff --git a/dom/tests/mochitest/whatwg/chrome.ini b/dom/tests/mochitest/whatwg/chrome.ini deleted file mode 100644 index 6d6bfc36c6d4..000000000000 --- a/dom/tests/mochitest/whatwg/chrome.ini +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] - -[test_postMessage_chrome.html] diff --git a/dom/tests/mochitest/whatwg/chrome.toml b/dom/tests/mochitest/whatwg/chrome.toml new file mode 100644 index 000000000000..9ec68ac2823a --- /dev/null +++ b/dom/tests/mochitest/whatwg/chrome.toml @@ -0,0 +1,3 @@ +[DEFAULT] + +["test_postMessage_chrome.html"] diff --git a/dom/tests/moz.build b/dom/tests/moz.build index 4b9e5921389d..16c5bc7c30dc 100644 --- a/dom/tests/moz.build +++ b/dom/tests/moz.build @@ -174,16 +174,16 @@ MOCHITEST_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "mochitest/beacon/chrome.ini", - "mochitest/chrome/chrome.ini", - "mochitest/fs/chrome.ini", - "mochitest/general/chrome.ini", - "mochitest/geolocation/chrome.ini", - "mochitest/keyhandling/chrome.ini", - "mochitest/localstorage/chrome.ini", - "mochitest/sessionstorage/chrome.ini", - "mochitest/webcomponents/chrome.ini", - "mochitest/whatwg/chrome.ini", + "mochitest/beacon/chrome.toml", + "mochitest/chrome/chrome.toml", + "mochitest/fs/chrome.toml", + "mochitest/general/chrome.toml", + "mochitest/geolocation/chrome.toml", + "mochitest/keyhandling/chrome.toml", + "mochitest/localstorage/chrome.toml", + "mochitest/sessionstorage/chrome.toml", + "mochitest/webcomponents/chrome.toml", + "mochitest/whatwg/chrome.toml", ] XPCSHELL_TESTS_MANIFESTS += ["unit/xpcshell.ini"] diff --git a/dom/url/moz.build b/dom/url/moz.build index 2f3807e6aab3..9baebf4e4cc0 100644 --- a/dom/url/moz.build +++ b/dom/url/moz.build @@ -24,7 +24,7 @@ LOCAL_INCLUDES += [ ] MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.toml"] BROWSER_CHROME_MANIFESTS += ["tests/browser.ini"] include("/ipc/chromium/chromium-config.mozbuild") diff --git a/dom/url/tests/chrome.ini b/dom/url/tests/chrome.ini deleted file mode 100644 index 1f1b9022c903..000000000000 --- a/dom/url/tests/chrome.ini +++ /dev/null @@ -1,12 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - file_url.jsm - file_worker_url.jsm - test_bug883784.jsm - jsm_url_worker.js - !/dom/workers/test/dom_worker_helper.js - -[test_bug883784.xhtml] -[test_url.xhtml] -[test_worker_url.xhtml] diff --git a/dom/url/tests/chrome.toml b/dom/url/tests/chrome.toml new file mode 100644 index 000000000000..874477331ddd --- /dev/null +++ b/dom/url/tests/chrome.toml @@ -0,0 +1,15 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "file_url.jsm", + "file_worker_url.jsm", + "test_bug883784.jsm", + "jsm_url_worker.js", + "!/dom/workers/test/dom_worker_helper.js", +] + +["test_bug883784.xhtml"] + +["test_url.xhtml"] + +["test_worker_url.xhtml"] diff --git a/dom/websocket/moz.build b/dom/websocket/moz.build index 306e19219fa2..f7b69cecbd0e 100644 --- a/dom/websocket/moz.build +++ b/dom/websocket/moz.build @@ -20,7 +20,7 @@ LOCAL_INCLUDES += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "tests/chrome.ini", + "tests/chrome.toml", ] MOCHITEST_MANIFESTS += [ diff --git a/dom/websocket/tests/chrome.ini b/dom/websocket/tests/chrome.ini deleted file mode 100644 index b781f62e6e19..000000000000 --- a/dom/websocket/tests/chrome.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' - -[test_websocket_frame.html] diff --git a/dom/websocket/tests/chrome.toml b/dom/websocket/tests/chrome.toml new file mode 100644 index 000000000000..ecc8c9f03086 --- /dev/null +++ b/dom/websocket/tests/chrome.toml @@ -0,0 +1,4 @@ +[DEFAULT] +skip-if = ["os == 'android'"] + +["test_websocket_frame.html"] diff --git a/dom/workers/moz.build b/dom/workers/moz.build index 4568e63ea430..f37736756d78 100644 --- a/dom/workers/moz.build +++ b/dom/workers/moz.build @@ -104,7 +104,7 @@ MOCHITEST_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "test/chrome.ini", + "test/chrome.toml", ] XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"] diff --git a/dom/workers/test/chrome.ini b/dom/workers/test/chrome.ini deleted file mode 100644 index 68a0f05f39b1..000000000000 --- a/dom/workers/test/chrome.ini +++ /dev/null @@ -1,98 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - WorkerDebugger.console_childWorker.js - WorkerDebugger.console_debugger.js - WorkerDebugger.console_worker.js - WorkerDebugger.initialize_childWorker.js - WorkerDebugger.initialize_debugger.js - WorkerDebugger.initialize_worker.js - WorkerDebugger.postMessage_childWorker.js - WorkerDebugger.postMessage_debugger.js - WorkerDebugger.postMessage_worker.js - WorkerDebuggerGlobalScope.createSandbox_debugger.js - WorkerDebuggerGlobalScope.createSandbox_sandbox.js - WorkerDebuggerGlobalScope.createSandbox_worker.js - WorkerDebuggerGlobalScope.enterEventLoop_childWorker.js - WorkerDebuggerGlobalScope.enterEventLoop_debugger.js - WorkerDebuggerGlobalScope.enterEventLoop_worker.js - WorkerDebuggerGlobalScope.reportError_childWorker.js - WorkerDebuggerGlobalScope.reportError_debugger.js - WorkerDebuggerGlobalScope.reportError_worker.js - WorkerDebuggerGlobalScope.setImmediate_debugger.js - WorkerDebuggerGlobalScope.setImmediate_worker.js - WorkerDebuggerManager_childWorker.js - WorkerDebuggerManager_worker.js - WorkerDebugger_childWorker.js - WorkerDebugger_frozen_window1.html - WorkerDebugger_frozen_window2.html - WorkerDebugger_frozen_worker1.js - WorkerDebugger_frozen_worker2.js - WorkerDebugger_promise_debugger.js - WorkerDebugger_promise_worker.js - WorkerDebugger_sharedWorker.js - WorkerDebugger_suspended_debugger.js - WorkerDebugger_suspended_worker.js - WorkerDebugger_worker.js - WorkerTest.jsm - WorkerTest_subworker.js - WorkerTest_worker.js - bug1062920_worker.js - chromeWorker_subworker.js - chromeWorker_worker_submod.sys.mjs - chromeWorker_worker.js - chromeWorker_worker.sys.mjs - dom_worker_helper.js - empty.html - fileBlobSubWorker_worker.js - fileBlob_worker.js - filePosting_worker.js - fileReadSlice_worker.js - fileReaderSyncErrors_worker.js - fileReaderSync_worker.js - fileSlice_worker.js - fileSubWorker_worker.js - file_worker.js - sharedWorker_privateBrowsing.js - sourcemap_header.js - sourcemap_header_debugger.js - -[test_WorkerDebugger.initialize.xhtml] -[test_WorkerDebugger.postMessage.xhtml] -[test_WorkerDebugger.xhtml] -skip-if = - true - (verify && !debug && os == 'linux') # Frequent intermittent on QR platforms Bug 1454935 -[test_WorkerDebuggerGlobalScope.createSandbox.xhtml] -[test_WorkerDebuggerGlobalScope.enterEventLoop.xhtml] -[test_WorkerDebuggerGlobalScope.reportError.xhtml] -[test_WorkerDebuggerGlobalScope.setImmediate.xhtml] -[test_WorkerDebuggerManager.xhtml] -skip-if = true # Frequent intermittent on QR platforms Bug 1454935 -[test_WorkerDebugger_console.xhtml] -[test_WorkerDebugger_frozen.xhtml] -skip-if = - debug # Bug 1828084 -[test_WorkerDebugger_promise.xhtml] -[test_WorkerDebugger_suspended.xhtml] -[test_chromeWorker.xhtml] -[test_chromeWorkerJSM.xhtml] -[test_file.xhtml] -skip-if = - os == "linux" && bits == 64 && debug # Bug 1765445 - os == "mac" && os_version == "10.15" && !debug # Bug 1765445 - win10_2004 && !debug # Bug 1765445 -[test_fileBlobPosting.xhtml] -[test_fileBlobSubWorker.xhtml] -[test_filePosting.xhtml] -[test_fileReadSlice.xhtml] -[test_fileReaderSync.xhtml] -[test_fileReaderSyncErrors.xhtml] -[test_fileSlice.xhtml] -[test_fileSubWorker.xhtml] -[test_bug1062920.xhtml] -[test_sharedWorker_privateBrowsing.html] -[test_shutdownCheck.xhtml] -support-files = worker_shutdownCheck.js -[test_sourcemap_header.html] -[test_readableStream_when_closing.html] diff --git a/dom/workers/test/chrome.toml b/dom/workers/test/chrome.toml new file mode 100644 index 000000000000..4a50894005ce --- /dev/null +++ b/dom/workers/test/chrome.toml @@ -0,0 +1,127 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "WorkerDebugger.console_childWorker.js", + "WorkerDebugger.console_debugger.js", + "WorkerDebugger.console_worker.js", + "WorkerDebugger.initialize_childWorker.js", + "WorkerDebugger.initialize_debugger.js", + "WorkerDebugger.initialize_worker.js", + "WorkerDebugger.postMessage_childWorker.js", + "WorkerDebugger.postMessage_debugger.js", + "WorkerDebugger.postMessage_worker.js", + "WorkerDebuggerGlobalScope.createSandbox_debugger.js", + "WorkerDebuggerGlobalScope.createSandbox_sandbox.js", + "WorkerDebuggerGlobalScope.createSandbox_worker.js", + "WorkerDebuggerGlobalScope.enterEventLoop_childWorker.js", + "WorkerDebuggerGlobalScope.enterEventLoop_debugger.js", + "WorkerDebuggerGlobalScope.enterEventLoop_worker.js", + "WorkerDebuggerGlobalScope.reportError_childWorker.js", + "WorkerDebuggerGlobalScope.reportError_debugger.js", + "WorkerDebuggerGlobalScope.reportError_worker.js", + "WorkerDebuggerGlobalScope.setImmediate_debugger.js", + "WorkerDebuggerGlobalScope.setImmediate_worker.js", + "WorkerDebuggerManager_childWorker.js", + "WorkerDebuggerManager_worker.js", + "WorkerDebugger_childWorker.js", + "WorkerDebugger_frozen_window1.html", + "WorkerDebugger_frozen_window2.html", + "WorkerDebugger_frozen_worker1.js", + "WorkerDebugger_frozen_worker2.js", + "WorkerDebugger_promise_debugger.js", + "WorkerDebugger_promise_worker.js", + "WorkerDebugger_sharedWorker.js", + "WorkerDebugger_suspended_debugger.js", + "WorkerDebugger_suspended_worker.js", + "WorkerDebugger_worker.js", + "WorkerTest.jsm", + "WorkerTest_subworker.js", + "WorkerTest_worker.js", + "bug1062920_worker.js", + "chromeWorker_subworker.js", + "chromeWorker_worker_submod.sys.mjs", + "chromeWorker_worker.js", + "chromeWorker_worker.sys.mjs", + "dom_worker_helper.js", + "empty.html", + "fileBlobSubWorker_worker.js", + "fileBlob_worker.js", + "filePosting_worker.js", + "fileReadSlice_worker.js", + "fileReaderSyncErrors_worker.js", + "fileReaderSync_worker.js", + "fileSlice_worker.js", + "fileSubWorker_worker.js", + "file_worker.js", + "sharedWorker_privateBrowsing.js", + "sourcemap_header.js", + "sourcemap_header_debugger.js", +] + +["test_WorkerDebugger.initialize.xhtml"] + +["test_WorkerDebugger.postMessage.xhtml"] + +["test_WorkerDebugger.xhtml"] +skip-if = [ + "true", + "(verify && !debug && os == 'linux')", # Frequent intermittent on QR platforms Bug 1454935 +] + +["test_WorkerDebuggerGlobalScope.createSandbox.xhtml"] + +["test_WorkerDebuggerGlobalScope.enterEventLoop.xhtml"] + +["test_WorkerDebuggerGlobalScope.reportError.xhtml"] + +["test_WorkerDebuggerGlobalScope.setImmediate.xhtml"] + +["test_WorkerDebuggerManager.xhtml"] +skip-if = ["true"] # Frequent intermittent on QR platforms Bug 1454935 + +["test_WorkerDebugger_console.xhtml"] + +["test_WorkerDebugger_frozen.xhtml"] +skip-if = ["debug"] # Bug 1828084 + +["test_WorkerDebugger_promise.xhtml"] + +["test_WorkerDebugger_suspended.xhtml"] + +["test_bug1062920.xhtml"] + +["test_chromeWorker.xhtml"] + +["test_chromeWorkerJSM.xhtml"] + +["test_file.xhtml"] +skip-if = [ + "os == 'linux' && bits == 64 && debug", # Bug 1765445 + "os == 'mac' && os_version == '10.15' && !debug", # Bug 1765445 + "win10_2004 && !debug", # Bug 1765445 +] + +["test_fileBlobPosting.xhtml"] + +["test_fileBlobSubWorker.xhtml"] + +["test_filePosting.xhtml"] + +["test_fileReadSlice.xhtml"] + +["test_fileReaderSync.xhtml"] + +["test_fileReaderSyncErrors.xhtml"] + +["test_fileSlice.xhtml"] + +["test_fileSubWorker.xhtml"] + +["test_readableStream_when_closing.html"] + +["test_sharedWorker_privateBrowsing.html"] + +["test_shutdownCheck.xhtml"] +support-files = ["worker_shutdownCheck.js"] + +["test_sourcemap_header.html"] diff --git a/dom/xul/moz.build b/dom/xul/moz.build index 6057c71aa56d..343f2cc3642b 100644 --- a/dom/xul/moz.build +++ b/dom/xul/moz.build @@ -10,7 +10,7 @@ with Files("**"): if CONFIG["MOZ_BUILD_APP"] == "browser": DEFINES["MOZ_BREAK_XUL_OVERLAYS"] = True -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] MOCHITEST_MANIFESTS += ["test/mochitest.ini"] EXPORTS += [ diff --git a/dom/xul/test/chrome.ini b/dom/xul/test/chrome.ini deleted file mode 100644 index 0e81ba89d203..000000000000 --- a/dom/xul/test/chrome.ini +++ /dev/null @@ -1,24 +0,0 @@ -[DEFAULT] -support-files = - 398289-resource.xhtml - window_bug583948.xhtml - -[test_bug199692.xhtml] -[test_bug311681.xhtml] -[test_bug391002.xhtml] -[test_bug398289.html] -[test_bug403868.xhtml] -[test_bug418216.xhtml] -[test_bug445177.xhtml] -[test_bug468176.xhtml] -[test_bug583948.xhtml] -[test_bug775972.xhtml] -[test_bug1070049_throw_from_script.xhtml] -[test_html_template.xhtml] -[test_import_xul_to_content.xhtml] -[test_bug1290965.xhtml] -[test_bug749367.xhtml] -[test_xul_tabindex_focus.xhtml] -[test_bug1686822.xhtml] - support-files = window_bug1686822.xhtml -[test_accesskey.xhtml] diff --git a/dom/xul/test/chrome.toml b/dom/xul/test/chrome.toml new file mode 100644 index 000000000000..e0d87a4e31ea --- /dev/null +++ b/dom/xul/test/chrome.toml @@ -0,0 +1,42 @@ +[DEFAULT] +support-files = [ + "398289-resource.xhtml", + "window_bug583948.xhtml", +] + +["test_accesskey.xhtml"] + +["test_bug1070049_throw_from_script.xhtml"] + +["test_bug1290965.xhtml"] + +["test_bug1686822.xhtml"] +support-files = ["window_bug1686822.xhtml"] + +["test_bug199692.xhtml"] + +["test_bug311681.xhtml"] + +["test_bug391002.xhtml"] + +["test_bug398289.html"] + +["test_bug403868.xhtml"] + +["test_bug418216.xhtml"] + +["test_bug445177.xhtml"] + +["test_bug468176.xhtml"] + +["test_bug583948.xhtml"] + +["test_bug749367.xhtml"] + +["test_bug775972.xhtml"] + +["test_html_template.xhtml"] + +["test_import_xul_to_content.xhtml"] + +["test_xul_tabindex_focus.xhtml"] diff --git a/editor/composer/moz.build b/editor/composer/moz.build index 38f0506665a3..56720fc42ce7 100644 --- a/editor/composer/moz.build +++ b/editor/composer/moz.build @@ -6,7 +6,7 @@ MOCHITEST_MANIFESTS += ["test/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] XPIDL_SOURCES += [ "nsIEditingSession.idl", diff --git a/editor/composer/test/chrome.ini b/editor/composer/test/chrome.ini deleted file mode 100644 index 8b4d9c333354..000000000000 --- a/editor/composer/test/chrome.ini +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' - -[test_bug1266815.html] -[test_bug434998.xhtml] diff --git a/editor/composer/test/chrome.toml b/editor/composer/test/chrome.toml new file mode 100644 index 000000000000..df88d8aaeb95 --- /dev/null +++ b/editor/composer/test/chrome.toml @@ -0,0 +1,6 @@ +[DEFAULT] +skip-if = ["os == 'android'"] + +["test_bug1266815.html"] + +["test_bug434998.xhtml"] diff --git a/editor/libeditor/moz.build b/editor/libeditor/moz.build index 935ebfb7a2a2..f71aa51331c8 100644 --- a/editor/libeditor/moz.build +++ b/editor/libeditor/moz.build @@ -9,7 +9,7 @@ MOCHITEST_MANIFESTS += [ "tests/mochitest.ini", ] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.toml"] BROWSER_CHROME_MANIFESTS += ["tests/browser.ini"] diff --git a/editor/libeditor/tests/chrome.ini b/editor/libeditor/tests/chrome.ini deleted file mode 100644 index 52955f048e6c..000000000000 --- a/editor/libeditor/tests/chrome.ini +++ /dev/null @@ -1,20 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' - -[test_bug1397412.xhtml] -[test_bug489202.xhtml] -[test_bug599983.xhtml] -[test_bug607584.xhtml] -[test_bug616590.xhtml] -[test_bug780908.xhtml] -[test_can_undo_after_setting_value.xhtml] -[test_contenteditable_text_input_handling.html] -[test_cut_copy_delete_command_enabled.xhtml] -[test_htmleditor_keyevent_handling.html] -[test_pasteImgTextarea.xhtml] -support-files = - green.png -[test_texteditor_keyevent_handling.html] -skip-if = - (debug && os=='win') # Bug 1116205, leaks on windows debug - (os == 'linux') # Fails delete key on linux diff --git a/editor/libeditor/tests/chrome.toml b/editor/libeditor/tests/chrome.toml new file mode 100644 index 000000000000..3f709dea3e4d --- /dev/null +++ b/editor/libeditor/tests/chrome.toml @@ -0,0 +1,31 @@ +[DEFAULT] +skip-if = ["os == 'android'"] + +["test_bug1397412.xhtml"] + +["test_bug489202.xhtml"] + +["test_bug599983.xhtml"] + +["test_bug607584.xhtml"] + +["test_bug616590.xhtml"] + +["test_bug780908.xhtml"] + +["test_can_undo_after_setting_value.xhtml"] + +["test_contenteditable_text_input_handling.html"] + +["test_cut_copy_delete_command_enabled.xhtml"] + +["test_htmleditor_keyevent_handling.html"] + +["test_pasteImgTextarea.xhtml"] +support-files = ["green.png"] + +["test_texteditor_keyevent_handling.html"] +skip-if = [ + "debug && os == 'win'", # Bug 1116205, leaks on windows debug + "os == 'linux'", # Fails delete key on linux +] diff --git a/editor/spellchecker/moz.build b/editor/spellchecker/moz.build index 8e4932c20920..afff1c05b0b5 100644 --- a/editor/spellchecker/moz.build +++ b/editor/spellchecker/moz.build @@ -6,7 +6,7 @@ MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.toml"] XPIDL_SOURCES += [ "nsIInlineSpellChecker.idl", diff --git a/editor/spellchecker/tests/chrome.ini b/editor/spellchecker/tests/chrome.ini deleted file mode 100644 index 76faf04121b0..000000000000 --- a/editor/spellchecker/tests/chrome.ini +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -prefs = - gfx.font_loader.delay=0 - -skip-if = os == 'android' - -[test_nsIEditorSpellCheck_ReplaceWord.html] -support-files = - spellcheck.js diff --git a/editor/spellchecker/tests/chrome.toml b/editor/spellchecker/tests/chrome.toml new file mode 100644 index 000000000000..f5fbdfac31ab --- /dev/null +++ b/editor/spellchecker/tests/chrome.toml @@ -0,0 +1,7 @@ +[DEFAULT] +prefs = ["gfx.font_loader.delay=0"] + +skip-if = ["os == 'android'"] + +["test_nsIEditorSpellCheck_ReplaceWord.html"] +support-files = ["spellcheck.js"] diff --git a/extensions/spellcheck/moz.build b/extensions/spellcheck/moz.build index 7493edfd6285..9705c70b816f 100644 --- a/extensions/spellcheck/moz.build +++ b/extensions/spellcheck/moz.build @@ -10,7 +10,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android": # GeckoView disables hunspell spellchecker. DIRS += ["locales"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] MOCHITEST_MANIFESTS += ["tests/mochitest/mochitest.ini"] SPHINX_TREES["/extensions/spellcheck"] = "docs" diff --git a/extensions/spellcheck/tests/chrome/chrome.ini b/extensions/spellcheck/tests/chrome/chrome.ini deleted file mode 100644 index 4aacb387c2c0..000000000000 --- a/extensions/spellcheck/tests/chrome/chrome.ini +++ /dev/null @@ -1,10 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' - -[test_add_remove_dictionaries.xhtml] -skip-if = verify -support-files = - base/base_utf.dic - base/base_utf.aff - map/maputf.dic - map/maputf.aff diff --git a/extensions/spellcheck/tests/chrome/chrome.toml b/extensions/spellcheck/tests/chrome/chrome.toml new file mode 100644 index 000000000000..36eff0016a5e --- /dev/null +++ b/extensions/spellcheck/tests/chrome/chrome.toml @@ -0,0 +1,11 @@ +[DEFAULT] +skip-if = ["os == 'android'"] + +["test_add_remove_dictionaries.xhtml"] +skip-if = ["verify"] +support-files = [ + "base/base_utf.dic", + "base/base_utf.aff", + "map/maputf.dic", + "map/maputf.aff", +] diff --git a/extensions/universalchardet/tests/chrome.ini b/extensions/universalchardet/tests/chrome.ini deleted file mode 100644 index a2b17a4dcebe..000000000000 --- a/extensions/universalchardet/tests/chrome.ini +++ /dev/null @@ -1,49 +0,0 @@ -[DEFAULT] -support-files = - CharsetDetectionTests.js - bug306272_text.html - bug426271_text-euc-jp.html - bug426271_text-utf-8.html - bug431054_text.html - bug631751be_text.html - bug631751le_text.html - bug638318_text.html - bug811363-1.text - bug811363-2.text - bug811363-3.text - bug811363-4.text - bug811363-5.text - bug811363-6.text - bug811363-7.text - bug811363-8.text - bug811363-9.text - bug811363-invalid-1.text - bug811363-invalid-5.text - bug1071816-1_text.html - bug1071816-2_text.html - bug1071816-3_text.html - bug1071816-4_text.html - -[test_bug306272.html] -[test_bug426271-euc-jp.html] -[test_bug426271-utf-8.html] -[test_bug431054-japanese.html] -[test_bug431054.html] -[test_bug631751be.html] -[test_bug631751le.html] -[test_bug638318.html] -[test_bug811363-1-1.html] -[test_bug811363-1-5.html] -[test_bug811363-2-1.html] -[test_bug811363-2-2.html] -[test_bug811363-2-3.html] -[test_bug811363-2-4.html] -[test_bug811363-2-5.html] -[test_bug811363-2-6.html] -[test_bug811363-2-7.html] -[test_bug811363-2-8.html] -[test_bug811363-2-9.html] -[test_bug1071816-1.html] -[test_bug1071816-2.html] -[test_bug1071816-3.html] -[test_bug1071816-4.html] diff --git a/extensions/universalchardet/tests/chrome.toml b/extensions/universalchardet/tests/chrome.toml new file mode 100644 index 000000000000..49825ed07cb3 --- /dev/null +++ b/extensions/universalchardet/tests/chrome.toml @@ -0,0 +1,72 @@ +[DEFAULT] +support-files = [ + "CharsetDetectionTests.js", + "bug306272_text.html", + "bug426271_text-euc-jp.html", + "bug426271_text-utf-8.html", + "bug431054_text.html", + "bug631751be_text.html", + "bug631751le_text.html", + "bug638318_text.html", + "bug811363-1.text", + "bug811363-2.text", + "bug811363-3.text", + "bug811363-4.text", + "bug811363-5.text", + "bug811363-6.text", + "bug811363-7.text", + "bug811363-8.text", + "bug811363-9.text", + "bug811363-invalid-1.text", + "bug811363-invalid-5.text", + "bug1071816-1_text.html", + "bug1071816-2_text.html", + "bug1071816-3_text.html", + "bug1071816-4_text.html", +] + +["test_bug1071816-1.html"] + +["test_bug1071816-2.html"] + +["test_bug1071816-3.html"] + +["test_bug1071816-4.html"] + +["test_bug306272.html"] + +["test_bug426271-euc-jp.html"] + +["test_bug426271-utf-8.html"] + +["test_bug431054-japanese.html"] + +["test_bug431054.html"] + +["test_bug631751be.html"] + +["test_bug631751le.html"] + +["test_bug638318.html"] + +["test_bug811363-1-1.html"] + +["test_bug811363-1-5.html"] + +["test_bug811363-2-1.html"] + +["test_bug811363-2-2.html"] + +["test_bug811363-2-3.html"] + +["test_bug811363-2-4.html"] + +["test_bug811363-2-5.html"] + +["test_bug811363-2-6.html"] + +["test_bug811363-2-7.html"] + +["test_bug811363-2-8.html"] + +["test_bug811363-2-9.html"] diff --git a/extensions/universalchardet/tests/moz.build b/extensions/universalchardet/tests/moz.build index 1a7d5281ea3f..36ed0467080b 100644 --- a/extensions/universalchardet/tests/moz.build +++ b/extensions/universalchardet/tests/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/. -MOCHITEST_CHROME_MANIFESTS += ["chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["chrome.toml"] diff --git a/gfx/tests/chrome/chrome.ini b/gfx/tests/chrome/chrome.ini deleted file mode 100644 index 6c5ba90a0d88..000000000000 --- a/gfx/tests/chrome/chrome.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] - -[test_device_reset.html] -subsuite = gpu diff --git a/gfx/tests/chrome/chrome.toml b/gfx/tests/chrome/chrome.toml new file mode 100644 index 000000000000..dcf809cb68ff --- /dev/null +++ b/gfx/tests/chrome/chrome.toml @@ -0,0 +1,4 @@ +[DEFAULT] + +["test_device_reset.html"] +subsuite = "gpu" diff --git a/gfx/tests/moz.build b/gfx/tests/moz.build index 83e02d043e66..fc0b6284835b 100644 --- a/gfx/tests/moz.build +++ b/gfx/tests/moz.build @@ -6,4 +6,4 @@ MOCHITEST_MANIFESTS += ["mochitest/mochitest.ini"] BROWSER_CHROME_MANIFESTS += ["browser/browser.ini"] -MOCHITEST_CHROME_MANIFESTS += ["chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["chrome/chrome.toml"] diff --git a/image/moz.build b/image/moz.build index aab71c1362ab..ee702de55e5e 100644 --- a/image/moz.build +++ b/image/moz.build @@ -21,7 +21,7 @@ BROWSER_CHROME_MANIFESTS += [ MOCHITEST_MANIFESTS += ["test/mochitest/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["test/mochitest/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/mochitest/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] diff --git a/image/test/mochitest/chrome.ini b/image/test/mochitest/chrome.ini deleted file mode 100644 index b84d0af89781..000000000000 --- a/image/test/mochitest/chrome.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' - -[test_bug415761.html] -skip-if = os != "win" || os_version == "6.2" -support-files = - bug415761.ico diff --git a/image/test/mochitest/chrome.toml b/image/test/mochitest/chrome.toml new file mode 100644 index 000000000000..5859cc70fd0d --- /dev/null +++ b/image/test/mochitest/chrome.toml @@ -0,0 +1,6 @@ +[DEFAULT] +skip-if = ["os == 'android'"] + +["test_bug415761.html"] +skip-if = ["os != 'win'"] +support-files = ["bug415761.ico"] diff --git a/intl/l10n/moz.build b/intl/l10n/moz.build index 4c06468e8e0a..3e39713c63c5 100644 --- a/intl/l10n/moz.build +++ b/intl/l10n/moz.build @@ -50,7 +50,7 @@ if CONFIG["COMPILE_ENVIRONMENT"]: ] XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell.ini"] -MOCHITEST_CHROME_MANIFESTS += ["test/mochitest/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/mochitest/chrome.toml"] SPHINX_TREES["/l10n"] = "docs" diff --git a/intl/l10n/test/mochitest/chrome.ini b/intl/l10n/test/mochitest/chrome.ini deleted file mode 100644 index 1b18537cc6de..000000000000 --- a/intl/l10n/test/mochitest/chrome.ini +++ /dev/null @@ -1,6 +0,0 @@ -[localization/test_formatValue.html] -skip-if = debug # Intentionally triggers a debug assert for missing Fluent arguments. -[localization/test_formatValues.html] -skip-if = debug # Intentionally triggers a debug assert for missing Fluent arguments. -[localization/test_formatMessages.html] -skip-if = debug # Intentionally triggers a debug assert for missing Fluent arguments. diff --git a/intl/l10n/test/mochitest/chrome.toml b/intl/l10n/test/mochitest/chrome.toml new file mode 100644 index 000000000000..0e0f500f5de1 --- /dev/null +++ b/intl/l10n/test/mochitest/chrome.toml @@ -0,0 +1,10 @@ +[DEFAULT] + +["localization/test_formatMessages.html"] +skip-if = ["debug"] # Intentionally triggers a debug assert for missing Fluent arguments. + +["localization/test_formatValue.html"] +skip-if = ["debug"] # Intentionally triggers a debug assert for missing Fluent arguments. + +["localization/test_formatValues.html"] +skip-if = ["debug"] # Intentionally triggers a debug assert for missing Fluent arguments. diff --git a/js/xpconnect/tests/chrome/chrome.ini b/js/xpconnect/tests/chrome/chrome.ini deleted file mode 100644 index 0211b70f3db3..000000000000 --- a/js/xpconnect/tests/chrome/chrome.ini +++ /dev/null @@ -1,127 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - bug503926.xhtml - file_bug484459.html - file_bug618176.xhtml - file_bug996069.html - file_bug1281071.html - file_discardSystemSource.html - file_empty.html - file_evalInSandbox.html - file_expandosharing.jsm - outoflinexulscript.js - subscript.js - utf8_subscript.js - worker_discardSystemSource.js - !/js/xpconnect/tests/mochitest/bug500931_helper.html - !/js/xpconnect/tests/mochitest/bug571849_helper.html - !/js/xpconnect/tests/mochitest/chrome_wrappers_helper.html - !/js/xpconnect/tests/mochitest/file_bug706301.html - !/js/xpconnect/tests/mochitest/file_bug738244.html - !/js/xpconnect/tests/mochitest/file_bug760131.html - !/js/xpconnect/tests/mochitest/file_bug795275.html - !/js/xpconnect/tests/mochitest/file_bug799348.html - !/js/xpconnect/tests/mochitest/file_bug860494.html - !/js/xpconnect/tests/mochitest/file_documentdomain.html - !/js/xpconnect/tests/mochitest/file_doublewrappedcompartments.html - !/js/xpconnect/tests/mochitest/file_empty.html - !/js/xpconnect/tests/mochitest/file_exnstack.html - !/js/xpconnect/tests/mochitest/file_expandosharing.html - !/js/xpconnect/tests/mochitest/file_nodelists.html - !/js/xpconnect/tests/mochitest/file_evalInSandbox.html - !/js/xpconnect/tests/mochitest/file_xrayic.html -prefs = - javascript.options.large_arraybuffers=true - -[test_APIExposer.xhtml] -[test_bug361111.xhtml] -[test_bug448587.xhtml] -[test_bug484459.xhtml] -skip-if = os == 'win' || os == 'mac' || (os == 'linux' && !debug) # bug 1131110, 1255284 -[test_bug500931.xhtml] -[test_bug503926.xhtml] -[test_bug533596.xhtml] -[test_bug571849.xhtml] -[test_bug610390.xhtml] -[test_bug614757.xhtml] -[test_bug616992.xhtml] -[test_bug618176.xhtml] -[test_bug654370.xhtml] -[test_bug658560.xhtml] -[test_bug658909.xhtml] -[test_bug664689.xhtml] -[test_bug679861.xhtml] -[test_bug706301.xhtml] -[test_bug726949.xhtml] -[test_bug732665.xhtml] -[test_bug738244.xhtml] -[test_bug743843.xhtml] -[test_bug760076.xhtml] -[test_bug760131.html] -[test_bug763343.xhtml] -[test_bug771429.xhtml] -[test_bug773962.xhtml] -[test_bug792280.xhtml] -[test_bug793433.xhtml] -[test_bug795275.xhtml] -[test_bug799348.xhtml] -[test_bug801241.xhtml] -[test_bug812415.xhtml] -[test_bug853283.xhtml] -[test_bug853571.xhtml] -[test_bug858101.xhtml] -[test_bug860494.xhtml] -[test_bug865948.xhtml] -[test_bug866823.xhtml] -[test_bug895340.xhtml] -[test_bug932906.xhtml] -allow_xul_xbl = true -[test_bug996069.xhtml] -[test_bug1041626.xhtml] -[test_bug1042436.xhtml] -[test_bug1065185.html] -[test_bug1074863.html] -[test_bug1092477.xhtml] -[test_bug1124898.html] -[test_bug1126911.html] -[test_bug1281071.xhtml] -[test_bug1390159.xhtml] -[test_bug1430164.html] -[test_bug1516237.html] -[test_chrometoSource.xhtml] -[test_cloneInto.xhtml] -[test_cows.xhtml] -[test_private_field_cows.xhtml] -[test_discardSystemSource.xhtml] -[test_documentdomain.xhtml] -[test_doublewrappedcompartments.xhtml] -[test_evalInSandbox.xhtml] -[test_evalInWindow.xhtml] -[test_exnstack.xhtml] -[test_expandosharing.xhtml] -[test_exposeInDerived.xhtml] -[test_inlineScripts.html] -[test_localstorage_with_nsEp.xhtml] -[test_matches.xhtml] -[test_nodelists.xhtml] -[test_nsScriptErrorWithStack.html] -[test_onGarbageCollection.html] -[test_precisegc.xhtml] -[test_sandboxImport.xhtml] -[test_secureContexts.html] -[test_scriptSettings.xhtml] -[test_scripterror.html] -[test_sharedChromeCompartment.html] -[test_weakmap_keys_preserved.xhtml] -[test_weakmap_keys_preserved2.xhtml] -[test_weakref.xhtml] -[test_windowProxyDeadWrapper.html] -[test_wrappers.xhtml] -[test_xrayic.xhtml] -[test_xrayLargeTypedArray.html] -skip-if = bits == 32 # Large ArrayBuffers not supported on 32-bit. -[test_xrayToJS.xhtml] -[test_bug1530146.html] -support-files = file_bug1530146.html file_bug1530146_inner.html -[test_envChain_event_handler.html] diff --git a/js/xpconnect/tests/chrome/chrome.toml b/js/xpconnect/tests/chrome/chrome.toml new file mode 100644 index 000000000000..2a60282fcdb9 --- /dev/null +++ b/js/xpconnect/tests/chrome/chrome.toml @@ -0,0 +1,220 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "bug503926.xhtml", + "file_bug484459.html", + "file_bug618176.xhtml", + "file_bug996069.html", + "file_bug1281071.html", + "file_discardSystemSource.html", + "file_empty.html", + "file_evalInSandbox.html", + "file_expandosharing.jsm", + "outoflinexulscript.js", + "subscript.js", + "utf8_subscript.js", + "worker_discardSystemSource.js", + "!/js/xpconnect/tests/mochitest/bug500931_helper.html", + "!/js/xpconnect/tests/mochitest/bug571849_helper.html", + "!/js/xpconnect/tests/mochitest/chrome_wrappers_helper.html", + "!/js/xpconnect/tests/mochitest/file_bug706301.html", + "!/js/xpconnect/tests/mochitest/file_bug738244.html", + "!/js/xpconnect/tests/mochitest/file_bug760131.html", + "!/js/xpconnect/tests/mochitest/file_bug795275.html", + "!/js/xpconnect/tests/mochitest/file_bug799348.html", + "!/js/xpconnect/tests/mochitest/file_bug860494.html", + "!/js/xpconnect/tests/mochitest/file_documentdomain.html", + "!/js/xpconnect/tests/mochitest/file_doublewrappedcompartments.html", + "!/js/xpconnect/tests/mochitest/file_empty.html", + "!/js/xpconnect/tests/mochitest/file_exnstack.html", + "!/js/xpconnect/tests/mochitest/file_expandosharing.html", + "!/js/xpconnect/tests/mochitest/file_nodelists.html", + "!/js/xpconnect/tests/mochitest/file_evalInSandbox.html", + "!/js/xpconnect/tests/mochitest/file_xrayic.html", +] +prefs = ["javascript.options.large_arraybuffers=true"] + +["test_APIExposer.xhtml"] + +["test_bug1041626.xhtml"] + +["test_bug1042436.xhtml"] + +["test_bug1065185.html"] + +["test_bug1074863.html"] + +["test_bug1092477.xhtml"] + +["test_bug1124898.html"] + +["test_bug1126911.html"] + +["test_bug1281071.xhtml"] + +["test_bug1390159.xhtml"] + +["test_bug1430164.html"] + +["test_bug1516237.html"] + +["test_bug1530146.html"] +support-files = [ + "file_bug1530146.html", + "file_bug1530146_inner.html", +] + +["test_bug361111.xhtml"] + +["test_bug448587.xhtml"] + +["test_bug484459.xhtml"] +skip-if = [ + "os == 'win'", + "os == 'mac'", + "os == 'linux' && !debug", +] # bug 1131110, 1255284 + +["test_bug500931.xhtml"] + +["test_bug503926.xhtml"] + +["test_bug533596.xhtml"] + +["test_bug571849.xhtml"] + +["test_bug610390.xhtml"] + +["test_bug614757.xhtml"] + +["test_bug616992.xhtml"] + +["test_bug618176.xhtml"] + +["test_bug654370.xhtml"] + +["test_bug658560.xhtml"] + +["test_bug658909.xhtml"] + +["test_bug664689.xhtml"] + +["test_bug679861.xhtml"] + +["test_bug706301.xhtml"] + +["test_bug726949.xhtml"] + +["test_bug732665.xhtml"] + +["test_bug738244.xhtml"] + +["test_bug743843.xhtml"] + +["test_bug760076.xhtml"] + +["test_bug760131.html"] + +["test_bug763343.xhtml"] + +["test_bug771429.xhtml"] + +["test_bug773962.xhtml"] + +["test_bug792280.xhtml"] + +["test_bug793433.xhtml"] + +["test_bug795275.xhtml"] + +["test_bug799348.xhtml"] + +["test_bug801241.xhtml"] + +["test_bug812415.xhtml"] + +["test_bug853283.xhtml"] + +["test_bug853571.xhtml"] + +["test_bug858101.xhtml"] + +["test_bug860494.xhtml"] + +["test_bug865948.xhtml"] + +["test_bug866823.xhtml"] + +["test_bug895340.xhtml"] + +["test_bug932906.xhtml"] +allow_xul_xbl = true + +["test_bug996069.xhtml"] + +["test_chrometoSource.xhtml"] + +["test_cloneInto.xhtml"] + +["test_cows.xhtml"] + +["test_discardSystemSource.xhtml"] + +["test_documentdomain.xhtml"] + +["test_doublewrappedcompartments.xhtml"] + +["test_envChain_event_handler.html"] + +["test_evalInSandbox.xhtml"] + +["test_evalInWindow.xhtml"] + +["test_exnstack.xhtml"] + +["test_expandosharing.xhtml"] + +["test_exposeInDerived.xhtml"] + +["test_inlineScripts.html"] + +["test_localstorage_with_nsEp.xhtml"] + +["test_matches.xhtml"] + +["test_nodelists.xhtml"] + +["test_nsScriptErrorWithStack.html"] + +["test_onGarbageCollection.html"] + +["test_precisegc.xhtml"] + +["test_private_field_cows.xhtml"] + +["test_sandboxImport.xhtml"] + +["test_scriptSettings.xhtml"] + +["test_scripterror.html"] + +["test_secureContexts.html"] + +["test_sharedChromeCompartment.html"] + +["test_weakmap_keys_preserved.xhtml"] + +["test_weakmap_keys_preserved2.xhtml"] + +["test_weakref.xhtml"] + +["test_windowProxyDeadWrapper.html"] + +["test_wrappers.xhtml"] + +["test_xrayLargeTypedArray.html"] +skip-if = ["bits == 32"] # Large ArrayBuffers not supported on 32-bit. + +["test_xrayToJS.xhtml"] + +["test_xrayic.xhtml"] diff --git a/js/xpconnect/tests/chrome/moz.build b/js/xpconnect/tests/chrome/moz.build index d371d3051fe3..51548541b7cc 100644 --- a/js/xpconnect/tests/chrome/moz.build +++ b/js/xpconnect/tests/chrome/moz.build @@ -4,7 +4,7 @@ # 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_MANIFESTS += ["chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["chrome.toml"] TEST_HARNESS_FILES.testing.mochitest.tests.js.xpconnect.tests.chrome += [ "file_discardSystemSource.html", diff --git a/layout/base/moz.build b/layout/base/moz.build index 0fffbcfa1cf3..b3d90784c900 100644 --- a/layout/base/moz.build +++ b/layout/base/moz.build @@ -186,4 +186,4 @@ FINAL_LIBRARY = "xul" BROWSER_CHROME_MANIFESTS += ["tests/browser.ini"] MARIONETTE_LAYOUT_MANIFESTS += ["tests/marionette/manifest.ini"] MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] diff --git a/layout/base/tests/chrome/chrome.ini b/layout/base/tests/chrome/chrome.ini deleted file mode 100644 index 672ad61c555c..000000000000 --- a/layout/base/tests/chrome/chrome.ini +++ /dev/null @@ -1,137 +0,0 @@ -[DEFAULT] -prefs = - dom.window.sizeToContent.enabled=true - layout.css.individual-transform.enabled=true - layout.css.motion-path.enabled=true -skip-if = os == 'android' -support-files = - animated.gif - blue-32x32.png - bug1722890.html - bug1722890_ref.html - bug1769161_1.html - bug1769161_1_ref.html - bug1769161_2.html - bug1769161_2_ref.html - bug1769161_3.html - bug1769161_3_ref.html - bug1769161_4.html - bug1769161_4_ref.html - bug551434_childframe.html - chrome_content_integration_window.xhtml - default_background_window.xhtml - dialog_with_positioning_window.xhtml - file_bug458898.html - green.png - printpreview_bug1713404_ref.html - printpreview_bug1730091_ref.html - printpreview_bug396024_helper.xhtml - printpreview_bug482976_helper.xhtml - printpreview_helper.xhtml - printpreview_downloadable_font.html - printpreview_downloadable_font_ref.html - printpreview_downloadable_font_in_iframe.html - printpreview_downloadable_font_in_iframe_ref.html - printpreview_font_api.html - printpreview_font_api_ref.html - printpreview_font_mozprintcallback.html - printpreview_font_mozprintcallback_ref.html - printpreview_quirks.html - printpreview_quirks_ref.html - printpreview_images.html - printpreview_images_ref.html - printpreview_images_sw.html - printpreview_images_sw_ref.html - printpreview_images_sw.js - printpreview_image_select.html - printpreview_image_select_ref.html - printpreview_mixed_page_size_001.html - printpreview_mixed_page_size_002.html - printpreview_pps_uw2.html - printpreview_pps_uw2_ref.html - printpreview_pps_uw2_no_margin_ref.html - printpreview_pps_uw4.html - printpreview_pps_uw4_ref.html - printpreview_pps_uw9.html - printpreview_pps_uw9_ref.html - printpreview_pps2.html - printpreview_pps2_ref.html - printpreview_pps4.html - printpreview_pps4_ref.html - printpreview_pps6.html - printpreview_pps6_ref.html - printpreview_pps9.html - printpreview_pps9_ref.html - printpreview_pps16.html - printpreview_pps16_ref.html - printpreview_prettyprint.xml - printpreview_prettyprint_ref.xhtml - printpreview_mask.html - print_page_size1.html - print_page_size1_ref.html - print_page_size2.html - print_page_size2_ref.html - print_page_size3.html - print_page_size3_ref.html - print_page_size4.html - print_page_size4_ref.html - red.png - color_adjust.html - color_adjust_ref.html - test_document_adopted_styles.html - test_document_adopted_styles_ref.html - test_shadow_root_adopted_styles.html - test_shadow_root_adopted_styles_ref.html - test_shared_adopted_styles.html - test_shared_adopted_styles_ref.html - file_bug1018265.xhtml - markA.ttf - markB.ttf - -[test_bug1018265.xhtml] -[test_bug1041200.xhtml] -skip-if = os == 'win' && bits == 64 # Bug 1272321 -support-files = - bug1041200_frame.html - bug1041200_window.html -[test_bug396367-1.html] -[test_bug396367-2.html] -[test_bug420499.xhtml] -[test_bug458898.html] -[test_bug465448.xhtml] -support-files = - file_bug465448.html -[test_bug514660.xhtml] -[test_bug533845.xhtml] -skip-if = os == 'linux' && !debug # Bug 1208197 -[test_bug551434.html] -[test_bug708062.html] -[test_bug812817.xhtml] -[test_chrome_content_integration.xhtml] -[test_color_scheme_browser.xhtml] -[test_css_visibility_propagation.xhtml] -support-files = - window_css_visibility_propagation-1.xhtml - window_css_visibility_propagation-2.xhtml - window_css_visibility_propagation-3.html - window_css_visibility_propagation-4.html - frame_css_visibility_propagation.html -[test_default_background.xhtml] -[test_dialog_with_positioning.html] -tags = openwindow -[test_fixed_bg_scrolling_repaints.html] -[test_getClientRectsAndTexts.html] -[test_get_printer_basic_attributes.html] -[test_get_printer_orientation.html] -[test_get_printer_paper_sizes.html] -[test_prerendered_transforms.html] -[test_printer_default_settings.html] -[test_printpreview.xhtml] -skip-if = (os == "linux" && bits == 32) || (verify && (os == 'win')) # Disabled on Linux32 for bug 1278957 -[test_printpreview_bug396024.xhtml] -skip-if = (verify && (os == 'win')) -[test_printpreview_bug482976.xhtml] -skip-if = (verify && (os == 'win')) -[test_scrolling_repaints.html] -[test_will_change.html] -skip-if = true diff --git a/layout/base/tests/chrome/chrome.toml b/layout/base/tests/chrome/chrome.toml new file mode 100644 index 000000000000..ed73e1322133 --- /dev/null +++ b/layout/base/tests/chrome/chrome.toml @@ -0,0 +1,171 @@ +[DEFAULT] +prefs = [ + "dom.window.sizeToContent.enabled=true", + "layout.css.individual-transform.enabled=true", + "layout.css.motion-path.enabled=true", +] +skip-if = ["os == 'android'"] +support-files = [ + "animated.gif", + "blue-32x32.png", + "bug1722890.html", + "bug1722890_ref.html", + "bug1769161_1.html", + "bug1769161_1_ref.html", + "bug1769161_2.html", + "bug1769161_2_ref.html", + "bug1769161_3.html", + "bug1769161_3_ref.html", + "bug1769161_4.html", + "bug1769161_4_ref.html", + "bug551434_childframe.html", + "chrome_content_integration_window.xhtml", + "default_background_window.xhtml", + "dialog_with_positioning_window.xhtml", + "file_bug458898.html", + "green.png", + "printpreview_bug1713404_ref.html", + "printpreview_bug1730091_ref.html", + "printpreview_bug396024_helper.xhtml", + "printpreview_bug482976_helper.xhtml", + "printpreview_helper.xhtml", + "printpreview_downloadable_font.html", + "printpreview_downloadable_font_ref.html", + "printpreview_downloadable_font_in_iframe.html", + "printpreview_downloadable_font_in_iframe_ref.html", + "printpreview_font_api.html", + "printpreview_font_api_ref.html", + "printpreview_font_mozprintcallback.html", + "printpreview_font_mozprintcallback_ref.html", + "printpreview_quirks.html", + "printpreview_quirks_ref.html", + "printpreview_images.html", + "printpreview_images_ref.html", + "printpreview_images_sw.html", + "printpreview_images_sw_ref.html", + "printpreview_images_sw.js", + "printpreview_image_select.html", + "printpreview_image_select_ref.html", + "printpreview_mixed_page_size_001.html", + "printpreview_mixed_page_size_002.html", + "printpreview_pps_uw2.html", + "printpreview_pps_uw2_ref.html", + "printpreview_pps_uw2_no_margin_ref.html", + "printpreview_pps_uw4.html", + "printpreview_pps_uw4_ref.html", + "printpreview_pps_uw9.html", + "printpreview_pps_uw9_ref.html", + "printpreview_pps2.html", + "printpreview_pps2_ref.html", + "printpreview_pps4.html", + "printpreview_pps4_ref.html", + "printpreview_pps6.html", + "printpreview_pps6_ref.html", + "printpreview_pps9.html", + "printpreview_pps9_ref.html", + "printpreview_pps16.html", + "printpreview_pps16_ref.html", + "printpreview_prettyprint.xml", + "printpreview_prettyprint_ref.xhtml", + "printpreview_mask.html", + "print_page_size1.html", + "print_page_size1_ref.html", + "print_page_size2.html", + "print_page_size2_ref.html", + "print_page_size3.html", + "print_page_size3_ref.html", + "print_page_size4.html", + "print_page_size4_ref.html", + "red.png", + "color_adjust.html", + "color_adjust_ref.html", + "test_document_adopted_styles.html", + "test_document_adopted_styles_ref.html", + "test_shadow_root_adopted_styles.html", + "test_shadow_root_adopted_styles_ref.html", + "test_shared_adopted_styles.html", + "test_shared_adopted_styles_ref.html", + "file_bug1018265.xhtml", + "markA.ttf", + "markB.ttf", +] + +["test_bug1018265.xhtml"] + +["test_bug1041200.xhtml"] +skip-if = ["os == 'win' && bits == 64"] # Bug 1272321 +support-files = [ + "bug1041200_frame.html", + "bug1041200_window.html", +] + +["test_bug396367-1.html"] + +["test_bug396367-2.html"] + +["test_bug420499.xhtml"] + +["test_bug458898.html"] + +["test_bug465448.xhtml"] +support-files = ["file_bug465448.html"] + +["test_bug514660.xhtml"] + +["test_bug533845.xhtml"] +skip-if = ["os == 'linux' && !debug"] # Bug 1208197 + +["test_bug551434.html"] + +["test_bug708062.html"] + +["test_bug812817.xhtml"] + +["test_chrome_content_integration.xhtml"] + +["test_color_scheme_browser.xhtml"] + +["test_css_visibility_propagation.xhtml"] +support-files = [ + "window_css_visibility_propagation-1.xhtml", + "window_css_visibility_propagation-2.xhtml", + "window_css_visibility_propagation-3.html", + "window_css_visibility_propagation-4.html", + "frame_css_visibility_propagation.html", +] + +["test_default_background.xhtml"] + +["test_dialog_with_positioning.html"] +tags = "openwindow" + +["test_fixed_bg_scrolling_repaints.html"] + +["test_getClientRectsAndTexts.html"] + +["test_get_printer_basic_attributes.html"] + +["test_get_printer_orientation.html"] + +["test_get_printer_paper_sizes.html"] + +["test_prerendered_transforms.html"] + +["test_printer_default_settings.html"] + +["test_printpreview.xhtml"] +skip-if = [ + "os == 'linux' && bits == 32", # Disabled on Linux32 for bug 1278957 + "verify && os == 'win'", +] + +["test_printpreview_bug396024.xhtml"] +skip-if = ["verify && os == 'win'"] + +["test_printpreview_bug482976.xhtml"] +skip-if = ["verify && os == 'win'"] + +["test_scrolling_repaints.html"] + +["test_will_change.html"] +skip-if = ["true"] diff --git a/layout/forms/moz.build b/layout/forms/moz.build index 7502fb5a9a3c..c284b9dc89de 100644 --- a/layout/forms/moz.build +++ b/layout/forms/moz.build @@ -8,7 +8,7 @@ with Files("**"): BUG_COMPONENT = ("Core", "Layout: Form Controls") MOCHITEST_MANIFESTS += ["test/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] EXPORTS += [ "nsIFormControlFrame.h", diff --git a/layout/forms/test/chrome.ini b/layout/forms/test/chrome.ini deleted file mode 100644 index cab43b716c5a..000000000000 --- a/layout/forms/test/chrome.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - bug536567_iframe.html - bug536567_subframe.html - -[test_bug536567_perwindowpb.html] diff --git a/layout/forms/test/chrome.toml b/layout/forms/test/chrome.toml new file mode 100644 index 000000000000..e37aa3957167 --- /dev/null +++ b/layout/forms/test/chrome.toml @@ -0,0 +1,8 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "bug536567_iframe.html", + "bug536567_subframe.html", +] + +["test_bug536567_perwindowpb.html"] diff --git a/layout/generic/moz.build b/layout/generic/moz.build index ed5eed0d4ae7..ab2cac303f78 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -284,7 +284,7 @@ CONTENT_ACCESSIBLE_FILES.html = [ ] MOCHITEST_MANIFESTS += ["test/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] diff --git a/layout/generic/test/chrome.ini b/layout/generic/test/chrome.ini deleted file mode 100644 index ab160840c307..000000000000 --- a/layout/generic/test/chrome.ini +++ /dev/null @@ -1,20 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - file_bug514732_window.xhtml - frame_selection_underline-ref.xhtml - frame_selection_underline.css - frame_selection_underline.xhtml - -[test_backspace_delete.xhtml] -skip-if = true # Bug 1163311 -[test_bug469613.xhtml] -[test_bug469774.xhtml] -[test_bug508115.xhtml] -[test_bug514732-2.xhtml] -[test_bug632379.xhtml] -skip-if = - verify && os == 'win' # Bug 1207914 - os == 'linux' # Bug 1207914 - os == 'win' # Bug 1765788 -[test_selection_underline.html] diff --git a/layout/generic/test/chrome.toml b/layout/generic/test/chrome.toml new file mode 100644 index 000000000000..67d8fa6ef07e --- /dev/null +++ b/layout/generic/test/chrome.toml @@ -0,0 +1,28 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "file_bug514732_window.xhtml", + "frame_selection_underline-ref.xhtml", + "frame_selection_underline.css", + "frame_selection_underline.xhtml", +] + +["test_backspace_delete.xhtml"] +skip-if = ["true"] # Bug 1163311 + +["test_bug469613.xhtml"] + +["test_bug469774.xhtml"] + +["test_bug508115.xhtml"] + +["test_bug514732-2.xhtml"] + +["test_bug632379.xhtml"] +skip-if = [ + "verify && os == 'win'", # Bug 1207914 + "os == 'linux'", # Bug 1207914 + "os == 'win'", # Bug 1765788 +] + +["test_selection_underline.html"] diff --git a/layout/inspector/moz.build b/layout/inspector/moz.build index e129ccce39fa..35dd6c8e277f 100644 --- a/layout/inspector/moz.build +++ b/layout/inspector/moz.build @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. if CONFIG["ENABLE_TESTS"]: - MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] + MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] XPIDL_SOURCES += [ diff --git a/layout/inspector/tests/chrome/chrome.ini b/layout/inspector/tests/chrome/chrome.ini deleted file mode 100644 index f756538a1085..000000000000 --- a/layout/inspector/tests/chrome/chrome.ini +++ /dev/null @@ -1,31 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = GentiumPlus-R.woff - -[test_bug467669.xhtml] -support-files = - test_bug467669.css -[test_bug695639.xhtml] -support-files = - test_bug695639.css -[test_bug708874.xhtml] -support-files = - test_bug708874.css -[test_bug727834.xhtml] -support-files = - test_bug727834.css -[test_fontFaceRanges.xhtml] -support-files = - test_fontFaceRanges.css -[test_fontFeaturesAPI.xhtml] -support-files = - test_fontFeaturesAPI.css - DejaVuSans.ttf -[test_fontVariationsAPI.xhtml] -skip-if = ((os == 'win' && bits!=64) || (os=='linux' && bits==32) || os == 'mac') # bug 1456855, bug 1456856 -support-files = - test_fontVariationsAPI.css -[test_fontFaceGeneric.xhtml] -[test_ua_rule_modification.html] -[test_ua_sheet_disable.html] -[test_visited_style.html] diff --git a/layout/inspector/tests/chrome/chrome.toml b/layout/inspector/tests/chrome/chrome.toml new file mode 100644 index 000000000000..a0aa0403a08b --- /dev/null +++ b/layout/inspector/tests/chrome/chrome.toml @@ -0,0 +1,40 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = ["GentiumPlus-R.woff"] + +["test_bug467669.xhtml"] +support-files = ["test_bug467669.css"] + +["test_bug695639.xhtml"] +support-files = ["test_bug695639.css"] + +["test_bug708874.xhtml"] +support-files = ["test_bug708874.css"] + +["test_bug727834.xhtml"] +support-files = ["test_bug727834.css"] + +["test_fontFaceGeneric.xhtml"] + +["test_fontFaceRanges.xhtml"] +support-files = ["test_fontFaceRanges.css"] + +["test_fontFeaturesAPI.xhtml"] +support-files = [ + "test_fontFeaturesAPI.css", + "DejaVuSans.ttf", +] + +["test_fontVariationsAPI.xhtml"] +skip-if = [ + "os == 'win' && bits == 32", + "os == 'linux' && bits == 32", # bug 1456855 + "os == 'mac'", # bug 1456856 +] +support-files = ["test_fontVariationsAPI.css"] + +["test_ua_rule_modification.html"] + +["test_ua_sheet_disable.html"] + +["test_visited_style.html"] diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build index da93ded04148..ddf2643d3f3a 100644 --- a/layout/mathml/moz.build +++ b/layout/mathml/moz.build @@ -9,7 +9,7 @@ with Files("**"): if CONFIG["ENABLE_TESTS"]: MOCHITEST_CHROME_MANIFESTS += [ - "tests/chrome.ini", + "tests/chrome.toml", ] UNIFIED_SOURCES += [ diff --git a/layout/mathml/tests/chrome.ini b/layout/mathml/tests/chrome.ini deleted file mode 100644 index ed36cf000b4a..000000000000 --- a/layout/mathml/tests/chrome.ini +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] - -support-files = - test_disabled_chrome_iframe.html -prefs= - mathml.disabled=true - -[test_disabled_chrome.html] diff --git a/layout/mathml/tests/chrome.toml b/layout/mathml/tests/chrome.toml new file mode 100644 index 000000000000..ec3d54556e64 --- /dev/null +++ b/layout/mathml/tests/chrome.toml @@ -0,0 +1,6 @@ +[DEFAULT] + +support-files = ["test_disabled_chrome_iframe.html"] +prefs = ["mathml.disabled=true"] + +["test_disabled_chrome.html"] diff --git a/layout/style/test/chrome/chrome.ini b/layout/style/test/chrome/chrome.ini deleted file mode 100644 index 95f9444c8c3b..000000000000 --- a/layout/style/test/chrome/chrome.ini +++ /dev/null @@ -1,31 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - bug418986-2.js - bug535806-css.css - bug535806-html.html - bug535806-xul.xhtml - hover_helper.html - match.png - mismatch.png - -[test_bug1346623.html] -[test_bug1371453.html] -[test_bug418986-2.xhtml] -[test_bug1157097.html] -[test_bug535806.xhtml] -[test_chrome_only_media_queries.html] -support-files = chrome-only-media-queries.js -[test_display_mode.html] -support-files = display_mode.html -tags = fullscreen -[test_display_mode_reflow.html] -support-files = display_mode_reflow.html -tags = fullscreen -[test_scrollbar_inline_size.html] -[test_hover.html] -skip-if = true # bug 1346353 -[test_moz_document_rules.html] -[test_stylesheet_clone_import_rule.html] -support-files = import_useless1.css import_useless2.css -[test_constructable_stylesheets_chrome_only_rules.html] diff --git a/layout/style/test/chrome/chrome.toml b/layout/style/test/chrome/chrome.toml new file mode 100644 index 000000000000..9d8e5e7339e4 --- /dev/null +++ b/layout/style/test/chrome/chrome.toml @@ -0,0 +1,47 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "bug418986-2.js", + "bug535806-css.css", + "bug535806-html.html", + "bug535806-xul.xhtml", + "hover_helper.html", + "match.png", + "mismatch.png", +] + +["test_bug1157097.html"] + +["test_bug1346623.html"] + +["test_bug1371453.html"] + +["test_bug418986-2.xhtml"] + +["test_bug535806.xhtml"] + +["test_chrome_only_media_queries.html"] +support-files = ["chrome-only-media-queries.js"] + +["test_constructable_stylesheets_chrome_only_rules.html"] + +["test_display_mode.html"] +support-files = ["display_mode.html"] +tags = "fullscreen" + +["test_display_mode_reflow.html"] +support-files = ["display_mode_reflow.html"] +tags = "fullscreen" + +["test_hover.html"] +skip-if = ["true"] # bug 1346353 + +["test_moz_document_rules.html"] + +["test_scrollbar_inline_size.html"] + +["test_stylesheet_clone_import_rule.html"] +support-files = [ + "import_useless1.css", + "import_useless2.css", +] diff --git a/layout/style/test/moz.build b/layout/style/test/moz.build index ec3de8537130..5fa93cb30164 100644 --- a/layout/style/test/moz.build +++ b/layout/style/test/moz.build @@ -25,7 +25,7 @@ MOCHITEST_MANIFESTS += [ "mochitest.ini", ] BROWSER_CHROME_MANIFESTS += ["browser.ini"] -MOCHITEST_CHROME_MANIFESTS += ["chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["chrome/chrome.toml"] TEST_HARNESS_FILES.testing.mochitest.tests.layout.style.test.chrome += [ "chrome/display_mode_reflow_iframe.html", diff --git a/layout/svg/moz.build b/layout/svg/moz.build index d32dcc636382..947803bd8de1 100644 --- a/layout/svg/moz.build +++ b/layout/svg/moz.build @@ -12,7 +12,7 @@ if CONFIG["ENABLE_TESTS"]: "tests/mochitest.ini", ] MOCHITEST_CHROME_MANIFESTS += [ - "tests/chrome.ini", + "tests/chrome.toml", ] EXPORTS.mozilla += [ diff --git a/layout/svg/tests/chrome.ini b/layout/svg/tests/chrome.ini deleted file mode 100644 index cc1b542a66b0..000000000000 --- a/layout/svg/tests/chrome.ini +++ /dev/null @@ -1,8 +0,0 @@ -[test_disabled_chrome.html] -support-files = - svg_example_test.html - svg_example_script.svg - -[test_context_properties_allowed_domains.html] -support-files = - file_context_fill_fallback_red.html diff --git a/layout/svg/tests/chrome.toml b/layout/svg/tests/chrome.toml new file mode 100644 index 000000000000..f5df0ab25762 --- /dev/null +++ b/layout/svg/tests/chrome.toml @@ -0,0 +1,10 @@ +[DEFAULT] + +["test_context_properties_allowed_domains.html"] +support-files = ["file_context_fill_fallback_red.html"] + +["test_disabled_chrome.html"] +support-files = [ + "svg_example_test.html", + "svg_example_script.svg", +] diff --git a/layout/xul/moz.build b/layout/xul/moz.build index 6942bff35330..6e33288d8c68 100644 --- a/layout/xul/moz.build +++ b/layout/xul/moz.build @@ -9,7 +9,7 @@ with Files("**"): if CONFIG["ENABLE_TESTS"]: MOCHITEST_MANIFESTS += ["test/mochitest.ini"] - MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] + MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] BROWSER_CHROME_MANIFESTS += ["test/browser.ini"] EXPORTS += [ diff --git a/layout/xul/test/chrome.ini b/layout/xul/test/chrome.ini deleted file mode 100644 index 67be92b0ce33..000000000000 --- a/layout/xul/test/chrome.ini +++ /dev/null @@ -1,38 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - windowminmaxsize1.xhtml - windowminmaxsize2.xhtml - windowminmaxsize3.xhtml - windowminmaxsize4.xhtml - windowminmaxsize5.xhtml - windowminmaxsize6.xhtml - windowminmaxsize7.xhtml - windowminmaxsize8.xhtml - windowminmaxsize9.xhtml - windowminmaxsize10.xhtml - titledpanelwindow.xhtml - -[test_bug159346.xhtml] -[test_bug381167.xhtml] -[test_bug398982-1.xhtml] -[test_bug398982-2.xhtml] -[test_bug467442.xhtml] -[test_bug477754.xhtml] -[test_bug703150.xhtml] -[test_bug987230.xhtml] -skip-if = os == 'linux' # No native mousedown event on Linux -[test_bug1197913.xhtml] -[test_popupReflowPos.xhtml] -[test_popupSizeTo.xhtml] -[test_popupZoom.xhtml] -[test_submenuClose.xhtml] -[test_windowminmaxsize.xhtml] -[test_resizer_ctrl_click.xhtml] -[test_resizer_incontent.xhtml] -[test_splitter.xhtml] -skip-if = toolkit == 'android' # no XUL theme -[test_splitter_sibling.xhtml] -skip-if = toolkit == 'android' # no XUL theme -[test_toolbarbutton_ctrl_click.xhtml] -[test_menuitem_ctrl_click.xhtml] diff --git a/layout/xul/test/chrome.toml b/layout/xul/test/chrome.toml new file mode 100644 index 000000000000..30fef4ed893c --- /dev/null +++ b/layout/xul/test/chrome.toml @@ -0,0 +1,58 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "windowminmaxsize1.xhtml", + "windowminmaxsize2.xhtml", + "windowminmaxsize3.xhtml", + "windowminmaxsize4.xhtml", + "windowminmaxsize5.xhtml", + "windowminmaxsize6.xhtml", + "windowminmaxsize7.xhtml", + "windowminmaxsize8.xhtml", + "windowminmaxsize9.xhtml", + "windowminmaxsize10.xhtml", + "titledpanelwindow.xhtml", +] + +["test_bug1197913.xhtml"] + +["test_bug159346.xhtml"] + +["test_bug381167.xhtml"] + +["test_bug398982-1.xhtml"] + +["test_bug398982-2.xhtml"] + +["test_bug467442.xhtml"] + +["test_bug477754.xhtml"] + +["test_bug703150.xhtml"] + +["test_bug987230.xhtml"] +skip-if = ["os == 'linux'"] # No native mousedown event on Linux + +["test_menuitem_ctrl_click.xhtml"] + +["test_popupReflowPos.xhtml"] + +["test_popupSizeTo.xhtml"] + +["test_popupZoom.xhtml"] + +["test_resizer_ctrl_click.xhtml"] + +["test_resizer_incontent.xhtml"] + +["test_splitter.xhtml"] +skip-if = ["toolkit == 'android'"] # no XUL theme + +["test_splitter_sibling.xhtml"] +skip-if = ["toolkit == 'android'"] # no XUL theme + +["test_submenuClose.xhtml"] + +["test_toolbarbutton_ctrl_click.xhtml"] + +["test_windowminmaxsize.xhtml"] diff --git a/mobile/android/components/extensions/moz.build b/mobile/android/components/extensions/moz.build index 9c61bf0e9442..334ab387b1d9 100644 --- a/mobile/android/components/extensions/moz.build +++ b/mobile/android/components/extensions/moz.build @@ -17,5 +17,5 @@ EXTRA_COMPONENTS += [ DIRS += ["schemas"] MOCHITEST_MANIFESTS += ["test/mochitest/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["test/mochitest/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/mochitest/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"] diff --git a/mobile/android/components/extensions/test/mochitest/chrome.ini b/mobile/android/components/extensions/test/mochitest/chrome.ini deleted file mode 100644 index 901c516d0a29..000000000000 --- a/mobile/android/components/extensions/test/mochitest/chrome.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -support-files = - head.js - ../../../../../../toolkit/components/extensions/test/mochitest/chrome_cleanup_script.js -tags = webextensions - -[test_ext_options_ui.html] diff --git a/mobile/android/components/extensions/test/mochitest/chrome.toml b/mobile/android/components/extensions/test/mochitest/chrome.toml new file mode 100644 index 000000000000..5a93353448a9 --- /dev/null +++ b/mobile/android/components/extensions/test/mochitest/chrome.toml @@ -0,0 +1,8 @@ +[DEFAULT] +support-files = [ + "head.js", + "../../../../../../toolkit/components/extensions/test/mochitest/chrome_cleanup_script.js", +] +tags = "webextensions" + +["test_ext_options_ui.html"] diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/chrome.ini b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/chrome.ini deleted file mode 100644 index 1db07cfac9c0..000000000000 --- a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/chrome.ini +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] - -[test_chrome.js] diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/chrome.toml b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/chrome.toml new file mode 100644 index 000000000000..bca2bc7308f9 --- /dev/null +++ b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/chrome.toml @@ -0,0 +1,3 @@ +[DEFAULT] + +["test_chrome.js"] diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/moz.build b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/moz.build index 2ad31dd04439..dfab1f4603eb 100644 --- a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/moz.build +++ b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/moz.build @@ -5,7 +5,7 @@ A11Y_MANIFESTS += ["a11y.toml"] BROWSER_CHROME_MANIFESTS += ["browser.ini"] METRO_CHROME_MANIFESTS += ["metro.ini"] MOCHITEST_MANIFESTS += ["mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["xpcshell.ini"] REFTEST_MANIFESTS += ["reftest.list"] CRASHTEST_MANIFESTS += ["crashtest.list"] diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py index 7a68a4323297..1a809390fd2f 100644 --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py @@ -940,9 +940,9 @@ class TestEmitterBasic(unittest.TestCase): "installs": {"mochitest.ini": False, "test_mochitest.js": True}, "external": {"external1", "external2"}, }, - "chrome.ini": { + "chrome.toml": { "flavor": "chrome", - "installs": {"chrome.ini": False, "test_chrome.js": True}, + "installs": {"chrome.toml": False, "test_chrome.js": True}, }, "xpcshell.ini": { "flavor": "xpcshell", diff --git a/services/fxaccounts/moz.build b/services/fxaccounts/moz.build index dd995a302aad..832367a045b2 100644 --- a/services/fxaccounts/moz.build +++ b/services/fxaccounts/moz.build @@ -7,7 +7,7 @@ with Files("**"): BUG_COMPONENT = ("Firefox", "Firefox Accounts") -MOCHITEST_CHROME_MANIFESTS += ["tests/mochitest/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/mochitest/chrome.toml"] BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"] diff --git a/services/fxaccounts/tests/mochitest/chrome.ini b/services/fxaccounts/tests/mochitest/chrome.ini deleted file mode 100644 index ab2e77053205..000000000000 --- a/services/fxaccounts/tests/mochitest/chrome.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files= - file_invalidEmailCase.sjs - -[test_invalidEmailCase.html] - diff --git a/services/fxaccounts/tests/mochitest/chrome.toml b/services/fxaccounts/tests/mochitest/chrome.toml new file mode 100644 index 000000000000..5e88133317c6 --- /dev/null +++ b/services/fxaccounts/tests/mochitest/chrome.toml @@ -0,0 +1,5 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = ["file_invalidEmailCase.sjs"] + +["test_invalidEmailCase.html"] diff --git a/toolkit/components/aboutmemory/moz.build b/toolkit/components/aboutmemory/moz.build index 017d8d126499..d525b54c27e2 100644 --- a/toolkit/components/aboutmemory/moz.build +++ b/toolkit/components/aboutmemory/moz.build @@ -4,7 +4,7 @@ # 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_MANIFESTS += ["tests/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += [ "tests/xpcshell/xpcshell.ini", ] diff --git a/toolkit/components/aboutmemory/tests/chrome.ini b/toolkit/components/aboutmemory/tests/chrome.ini deleted file mode 100644 index 4e5071e4a06a..000000000000 --- a/toolkit/components/aboutmemory/tests/chrome.ini +++ /dev/null @@ -1,31 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - crash-dump-diff1.json - crash-dump-diff2.json - crash-dump-good.json - fiss-diff1.json - fiss-diff2.json - memory-reports-bad.json - memory-reports-diff1.json - memory-reports-diff2.json - memory-reports-good.json - remote.xhtml - -[test_aboutmemory.xhtml] -[test_aboutmemory2.xhtml] -[test_aboutmemory3.xhtml] -[test_aboutmemory4.xhtml] -skip-if = - os == "linux" && bits == 64 && debug # Bug 1683002 -[test_aboutmemory5.xhtml] -skip-if = - asan # Bug 1116230 - os == "linux" && bits == 64 && debug # Bug 1683002 -[test_aboutmemory6.xhtml] -[test_aboutmemory7.xhtml] -[test_memoryReporters.xhtml] -[test_memoryReporters2.xhtml] -[test_sqliteMultiReporter.xhtml] -[test_dumpGCAndCCLogsToFile.xhtml] -skip-if = (verify && debug && (os == 'mac')) diff --git a/toolkit/components/aboutmemory/tests/chrome.toml b/toolkit/components/aboutmemory/tests/chrome.toml new file mode 100644 index 000000000000..7bc72d7730ae --- /dev/null +++ b/toolkit/components/aboutmemory/tests/chrome.toml @@ -0,0 +1,42 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "crash-dump-diff1.json", + "crash-dump-diff2.json", + "crash-dump-good.json", + "fiss-diff1.json", + "fiss-diff2.json", + "memory-reports-bad.json", + "memory-reports-diff1.json", + "memory-reports-diff2.json", + "memory-reports-good.json", + "remote.xhtml", +] + +["test_aboutmemory.xhtml"] + +["test_aboutmemory2.xhtml"] + +["test_aboutmemory3.xhtml"] + +["test_aboutmemory4.xhtml"] +skip-if = ["os == 'linux' && bits == 64 && debug"] # Bug 1683002 + +["test_aboutmemory5.xhtml"] +skip-if = [ + "asan", # Bug 1116230 + "os == 'linux' && bits == 64 && debug", # Bug 1683002 +] + +["test_aboutmemory6.xhtml"] + +["test_aboutmemory7.xhtml"] + +["test_dumpGCAndCCLogsToFile.xhtml"] +skip-if = ["(verify && debug && (os == 'mac'))"] + +["test_memoryReporters.xhtml"] + +["test_memoryReporters2.xhtml"] + +["test_sqliteMultiReporter.xhtml"] diff --git a/toolkit/components/certviewer/moz.build b/toolkit/components/certviewer/moz.build index c0ab85d0f129..b3b45a9973b7 100644 --- a/toolkit/components/certviewer/moz.build +++ b/toolkit/components/certviewer/moz.build @@ -8,7 +8,7 @@ JAR_MANIFESTS += ["jar.mn"] BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] EXTRA_JS_MODULES += [ "AboutCertViewerChild.sys.mjs", diff --git a/toolkit/components/certviewer/tests/chrome/chrome.ini b/toolkit/components/certviewer/tests/chrome/chrome.ini deleted file mode 100644 index 6f0774387515..000000000000 --- a/toolkit/components/certviewer/tests/chrome/chrome.ini +++ /dev/null @@ -1,12 +0,0 @@ -[DEFAULT] -scheme=https -[test_adjustCertInformation.html] -support-files = - parseOutput.mjs -[test_certDecoder.html] -[test_certDecoderFields.html] -support-files = - CSoutput.mjs -[test_kebabCaseInAdjustCertInformation.html] -support-files = - parseOutput.mjs diff --git a/toolkit/components/certviewer/tests/chrome/chrome.toml b/toolkit/components/certviewer/tests/chrome/chrome.toml new file mode 100644 index 000000000000..2afba193c0a1 --- /dev/null +++ b/toolkit/components/certviewer/tests/chrome/chrome.toml @@ -0,0 +1,13 @@ +[DEFAULT] +scheme = "https" + +["test_adjustCertInformation.html"] +support-files = ["parseOutput.mjs"] + +["test_certDecoder.html"] + +["test_certDecoderFields.html"] +support-files = ["CSoutput.mjs"] + +["test_kebabCaseInAdjustCertInformation.html"] +support-files = ["parseOutput.mjs"] diff --git a/toolkit/components/ctypes/tests/chrome/chrome.ini b/toolkit/components/ctypes/tests/chrome/chrome.ini deleted file mode 100644 index b45d8450af6d..000000000000 --- a/toolkit/components/ctypes/tests/chrome/chrome.ini +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - xpcshellTestHarnessAdaptor.js - ctypes_worker.js - ../unit/test_jsctypes.js - -[test_ctypes.xhtml] -skip-if = verify diff --git a/toolkit/components/ctypes/tests/chrome/chrome.toml b/toolkit/components/ctypes/tests/chrome/chrome.toml new file mode 100644 index 000000000000..22c64cb3f389 --- /dev/null +++ b/toolkit/components/ctypes/tests/chrome/chrome.toml @@ -0,0 +1,10 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "xpcshellTestHarnessAdaptor.js", + "ctypes_worker.js", + "../unit/test_jsctypes.js", +] + +["test_ctypes.xhtml"] +skip-if = ["verify"] diff --git a/toolkit/components/ctypes/tests/moz.build b/toolkit/components/ctypes/tests/moz.build index aec527bc87e2..336db309b3ee 100644 --- a/toolkit/components/ctypes/tests/moz.build +++ b/toolkit/components/ctypes/tests/moz.build @@ -7,7 +7,7 @@ DIST_INSTALL = False XPCSHELL_TESTS_MANIFESTS += ["unit/xpcshell.ini"] -MOCHITEST_CHROME_MANIFESTS += ["chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["chrome/chrome.toml"] UNIFIED_SOURCES += [ "jsctypes-test-errno.cpp", diff --git a/toolkit/components/extensions/moz.build b/toolkit/components/extensions/moz.build index 7bf99f2a4d64..601023f17b76 100644 --- a/toolkit/components/extensions/moz.build +++ b/toolkit/components/extensions/moz.build @@ -120,7 +120,7 @@ MOCHITEST_MANIFESTS += [ "test/mochitest/mochitest-remote.ini", "test/mochitest/mochitest.ini", ] -MOCHITEST_CHROME_MANIFESTS += ["test/mochitest/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/mochitest/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += [ "test/xpcshell/native_messaging.ini", "test/xpcshell/xpcshell-e10s.ini", diff --git a/toolkit/components/extensions/test/mochitest/chrome.ini b/toolkit/components/extensions/test/mochitest/chrome.ini deleted file mode 100644 index 30781a875995..000000000000 --- a/toolkit/components/extensions/test/mochitest/chrome.ini +++ /dev/null @@ -1,38 +0,0 @@ -[DEFAULT] -support-files = - chrome_cleanup_script.js - head.js - head_cookies.js - file_image_good.png - file_image_great.png - file_sample.html - file_with_images.html - webrequest_chromeworker.js - webrequest_test.sys.mjs -prefs = - security.mixed_content.upgrade_display_content=false -tags = webextensions in-process-webextensions - -# NO NEW TESTS. mochitest-chrome does not run under e10s, avoid adding new -# tests here unless absolutely necessary. - -[test_chrome_ext_contentscript_data_uri.html] -[test_chrome_ext_contentscript_telemetry.html] -[test_chrome_ext_contentscript_unrecognizedprop_warning.html] -[test_chrome_ext_downloads_open.html] -[test_chrome_ext_downloads_saveAs.html] -skip-if = (verify && !debug && (os == 'win')) || (os == 'android') || (os == 'win' && os_version == '10.0') # Bug 1695612 -[test_chrome_ext_downloads_uniquify.html] -skip-if = os == 'win' && os_version == '10.0' # Bug 1695612 -[test_chrome_ext_permissions.html] -skip-if = os == 'android' # Bug 1350559 -[test_chrome_ext_svg_context_fill.html] -[test_chrome_ext_trackingprotection.html] -[test_chrome_ext_webnavigation_resolved_urls.html] -[test_chrome_ext_webrequest_background_events.html] -[test_chrome_ext_webrequest_host_permissions.html] -skip-if = verify -[test_chrome_ext_webrequest_mozextension.html] -skip-if = true # Bug 1404172 -[test_chrome_native_messaging_paths.html] -skip-if = os != "mac" && os != "linux" diff --git a/toolkit/components/extensions/test/mochitest/chrome.toml b/toolkit/components/extensions/test/mochitest/chrome.toml new file mode 100644 index 000000000000..0fbd044f5360 --- /dev/null +++ b/toolkit/components/extensions/test/mochitest/chrome.toml @@ -0,0 +1,55 @@ +[DEFAULT] +support-files = [ + "chrome_cleanup_script.js", + "head.js", + "head_cookies.js", + "file_image_good.png", + "file_image_great.png", + "file_sample.html", + "file_with_images.html", + "webrequest_chromeworker.js", + "webrequest_test.sys.mjs", +] +prefs = ["security.mixed_content.upgrade_display_content=false"] +tags = "webextensions in-process-webextensions" + +# NO NEW TESTS. mochitest-chrome does not run under e10s, avoid adding new +# tests here unless absolutely necessary. + +["test_chrome_ext_contentscript_data_uri.html"] + +["test_chrome_ext_contentscript_telemetry.html"] + +["test_chrome_ext_contentscript_unrecognizedprop_warning.html"] + +["test_chrome_ext_downloads_open.html"] + +["test_chrome_ext_downloads_saveAs.html"] +skip-if = [ + "verify && !debug && os == 'win'", + "os == 'android'", + "win10_2009", # Bug 1695612 +] + +["test_chrome_ext_downloads_uniquify.html"] +skip-if = ["win10_2009"] # Bug 1695612 + +["test_chrome_ext_permissions.html"] +skip-if = ["os == 'android'"] # Bug 1350559 + +["test_chrome_ext_svg_context_fill.html"] + +["test_chrome_ext_trackingprotection.html"] + +["test_chrome_ext_webnavigation_resolved_urls.html"] + +["test_chrome_ext_webrequest_background_events.html"] + +["test_chrome_ext_webrequest_host_permissions.html"] +skip-if = ["verify"] + +["test_chrome_ext_webrequest_mozextension.html"] +skip-if = ["true"] # Bug 1404172 + +["test_chrome_native_messaging_paths.html"] +skip-if = ["os != 'mac' && os != 'linux'"] diff --git a/toolkit/components/places/tests/chrome/chrome.ini b/toolkit/components/places/tests/chrome/chrome.ini deleted file mode 100644 index 20f6e89db9bd..000000000000 --- a/toolkit/components/places/tests/chrome/chrome.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -support-files = head.js - -[test_371798.xhtml] -[test_favicon_annotations.xhtml] -[test_browser_disableglobalhistory.xhtml] -support-files = browser_disableglobalhistory.xhtml diff --git a/toolkit/components/places/tests/chrome/chrome.toml b/toolkit/components/places/tests/chrome/chrome.toml new file mode 100644 index 000000000000..a873b54746fb --- /dev/null +++ b/toolkit/components/places/tests/chrome/chrome.toml @@ -0,0 +1,9 @@ +[DEFAULT] +support-files = ["head.js"] + +["test_371798.xhtml"] + +["test_browser_disableglobalhistory.xhtml"] +support-files = ["browser_disableglobalhistory.xhtml"] + +["test_favicon_annotations.xhtml"] diff --git a/toolkit/components/places/tests/moz.build b/toolkit/components/places/tests/moz.build index 97662e2a4b00..cf9c3b37299c 100644 --- a/toolkit/components/places/tests/moz.build +++ b/toolkit/components/places/tests/moz.build @@ -29,7 +29,7 @@ BROWSER_CHROME_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "chrome/chrome.ini", + "chrome/chrome.toml", ] TEST_HARNESS_FILES.xpcshell.toolkit.components.places.tests += [ diff --git a/toolkit/components/prompts/moz.build b/toolkit/components/prompts/moz.build index fc1604a8053a..e100976c7847 100644 --- a/toolkit/components/prompts/moz.build +++ b/toolkit/components/prompts/moz.build @@ -19,6 +19,6 @@ TESTING_JS_MODULES += [ ] MOCHITEST_MANIFESTS += ["test/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] JAR_MANIFESTS += ["jar.mn"] diff --git a/toolkit/components/prompts/test/chrome.ini b/toolkit/components/prompts/test/chrome.ini deleted file mode 100644 index 90eee3a76183..000000000000 --- a/toolkit/components/prompts/test/chrome.ini +++ /dev/null @@ -1,11 +0,0 @@ -[DEFAULT] -support-files = - prompt_common.js - chromeScript.js - -[test_modal_prompts.html] -skip-if = - toolkit == 'android' #android: TIMED_OUT - os == 'linux' && (debug || asan || tsan) -[test_modal_select.html] -skip-if = toolkit == 'android' #android: TIMED_OUT diff --git a/toolkit/components/prompts/test/chrome.toml b/toolkit/components/prompts/test/chrome.toml new file mode 100644 index 000000000000..f90c8b7dd416 --- /dev/null +++ b/toolkit/components/prompts/test/chrome.toml @@ -0,0 +1,14 @@ +[DEFAULT] +support-files = [ + "prompt_common.js", + "chromeScript.js", +] + +["test_modal_prompts.html"] +skip-if = [ + "toolkit == 'android'", #android: TIMED_OUT + "os == 'linux' && (debug || asan || tsan)", +] + +["test_modal_select.html"] +skip-if = ["toolkit == 'android'"] #android: TIMED_OUT diff --git a/toolkit/components/resistfingerprinting/tests/chrome.ini b/toolkit/components/resistfingerprinting/tests/chrome.ini deleted file mode 100644 index ff7c487ab426..000000000000 --- a/toolkit/components/resistfingerprinting/tests/chrome.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' - -[test_spoof_english.html] diff --git a/toolkit/components/resistfingerprinting/tests/chrome.toml b/toolkit/components/resistfingerprinting/tests/chrome.toml new file mode 100644 index 000000000000..6ccea5d1e097 --- /dev/null +++ b/toolkit/components/resistfingerprinting/tests/chrome.toml @@ -0,0 +1,4 @@ +[DEFAULT] +skip-if = ["os == 'android'"] + +["test_spoof_english.html"] diff --git a/toolkit/components/resistfingerprinting/tests/moz.build b/toolkit/components/resistfingerprinting/tests/moz.build index f5c158219392..b09aea64e950 100644 --- a/toolkit/components/resistfingerprinting/tests/moz.build +++ b/toolkit/components/resistfingerprinting/tests/moz.build @@ -3,7 +3,7 @@ UNIFIED_SOURCES += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "chrome.ini", + "chrome.toml", ] BROWSER_CHROME_MANIFESTS += [ diff --git a/toolkit/components/url-classifier/tests/mochitest/chrome.ini b/toolkit/components/url-classifier/tests/mochitest/chrome.ini deleted file mode 100644 index 71087f55ab0c..000000000000 --- a/toolkit/components/url-classifier/tests/mochitest/chrome.ini +++ /dev/null @@ -1,69 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - allowlistAnnotatedFrame.html - classifiedAnnotatedFrame.html - classifiedAnnotatedPBFrame.html - trackingRequest.html - bug_1281083.html - bug_1580416.html - report.sjs - gethash.sjs - classifierCommon.js - classifierHelper.js - head.js - threathit.sjs - redirect_tracker.sjs - !/toolkit/components/url-classifier/tests/mochitest/classifierFrame.html - !/toolkit/components/url-classifier/tests/mochitest/cleanWorker.js - !/toolkit/components/url-classifier/tests/mochitest/good.js - !/toolkit/components/url-classifier/tests/mochitest/evil.css - !/toolkit/components/url-classifier/tests/mochitest/evil.css^headers^ - !/toolkit/components/url-classifier/tests/mochitest/evil.js - !/toolkit/components/url-classifier/tests/mochitest/evil.js^headers^ - !/toolkit/components/url-classifier/tests/mochitest/evilWorker.js - !/toolkit/components/url-classifier/tests/mochitest/import.css - !/toolkit/components/url-classifier/tests/mochitest/raptor.jpg - !/toolkit/components/url-classifier/tests/mochitest/track.html - !/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js - !/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js^headers^ - !/toolkit/components/url-classifier/tests/mochitest/unwantedWorker.js - !/toolkit/components/url-classifier/tests/mochitest/vp9.webm - !/toolkit/components/url-classifier/tests/mochitest/whitelistFrame.html - !/toolkit/components/url-classifier/tests/mochitest/workerFrame.html - !/toolkit/components/url-classifier/tests/mochitest/ping.sjs - !/toolkit/components/url-classifier/tests/mochitest/basic.vtt - !/toolkit/components/url-classifier/tests/mochitest/basic.vtt^headers^ - !/toolkit/components/url-classifier/tests/mochitest/dnt.html - !/toolkit/components/url-classifier/tests/mochitest/dnt.sjs - !/toolkit/components/url-classifier/tests/mochitest/update.sjs - !/toolkit/components/url-classifier/tests/mochitest/bad.css - !/toolkit/components/url-classifier/tests/mochitest/bad.css^headers^ - !/toolkit/components/url-classifier/tests/mochitest/gethashFrame.html - !/toolkit/components/url-classifier/tests/mochitest/seek.webm - !/toolkit/components/url-classifier/tests/mochitest/cache.sjs - -[test_classified_annotations.html] -tags = trackingprotection -skip-if = os == 'linux' && asan # Bug 1202548 -[test_allowlisted_annotations.html] -tags = trackingprotection -[test_privatebrowsing_trackingprotection.html] -tags = trackingprotection -[test_trackingprotection_bug1157081.html] -tags = trackingprotection -[test_trackingprotection_bug1580416.html] -tags = trackingprotection -[test_trackingprotection_whitelist.html] -tags = trackingprotection -[test_safebrowsing_bug1272239.html] -[test_donottrack.html] -[test_classifier_changetablepref.html] -skip-if = verify -[test_classifier_changetablepref_bug1395411.html] -[test_reporturl.html] -skip-if = verify -[test_trackingprotection_bug1312515.html] -[test_advisory_link.html] -[test_threathit_report.html] -skip-if = verify diff --git a/toolkit/components/url-classifier/tests/mochitest/chrome.toml b/toolkit/components/url-classifier/tests/mochitest/chrome.toml new file mode 100644 index 000000000000..cbd0e475e33c --- /dev/null +++ b/toolkit/components/url-classifier/tests/mochitest/chrome.toml @@ -0,0 +1,83 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "allowlistAnnotatedFrame.html", + "classifiedAnnotatedFrame.html", + "classifiedAnnotatedPBFrame.html", + "trackingRequest.html", + "bug_1281083.html", + "bug_1580416.html", + "report.sjs", + "gethash.sjs", + "classifierCommon.js", + "classifierHelper.js", + "head.js", + "threathit.sjs", + "redirect_tracker.sjs", + "!/toolkit/components/url-classifier/tests/mochitest/classifierFrame.html", + "!/toolkit/components/url-classifier/tests/mochitest/cleanWorker.js", + "!/toolkit/components/url-classifier/tests/mochitest/good.js", + "!/toolkit/components/url-classifier/tests/mochitest/evil.css", + "!/toolkit/components/url-classifier/tests/mochitest/evil.css^headers^", + "!/toolkit/components/url-classifier/tests/mochitest/evil.js", + "!/toolkit/components/url-classifier/tests/mochitest/evil.js^headers^", + "!/toolkit/components/url-classifier/tests/mochitest/evilWorker.js", + "!/toolkit/components/url-classifier/tests/mochitest/import.css", + "!/toolkit/components/url-classifier/tests/mochitest/raptor.jpg", + "!/toolkit/components/url-classifier/tests/mochitest/track.html", + "!/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js", + "!/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js^headers^", + "!/toolkit/components/url-classifier/tests/mochitest/unwantedWorker.js", + "!/toolkit/components/url-classifier/tests/mochitest/vp9.webm", + "!/toolkit/components/url-classifier/tests/mochitest/whitelistFrame.html", + "!/toolkit/components/url-classifier/tests/mochitest/workerFrame.html", + "!/toolkit/components/url-classifier/tests/mochitest/ping.sjs", + "!/toolkit/components/url-classifier/tests/mochitest/basic.vtt", + "!/toolkit/components/url-classifier/tests/mochitest/basic.vtt^headers^", + "!/toolkit/components/url-classifier/tests/mochitest/dnt.html", + "!/toolkit/components/url-classifier/tests/mochitest/dnt.sjs", + "!/toolkit/components/url-classifier/tests/mochitest/update.sjs", + "!/toolkit/components/url-classifier/tests/mochitest/bad.css", + "!/toolkit/components/url-classifier/tests/mochitest/bad.css^headers^", + "!/toolkit/components/url-classifier/tests/mochitest/gethashFrame.html", + "!/toolkit/components/url-classifier/tests/mochitest/seek.webm", + "!/toolkit/components/url-classifier/tests/mochitest/cache.sjs", +] + +["test_advisory_link.html"] + +["test_allowlisted_annotations.html"] +tags = "trackingprotection" + +["test_classified_annotations.html"] +tags = "trackingprotection" +skip-if = ["os == 'linux' && asan"] # Bug 1202548 + +["test_classifier_changetablepref.html"] +skip-if = ["verify"] + +["test_classifier_changetablepref_bug1395411.html"] + +["test_donottrack.html"] + +["test_privatebrowsing_trackingprotection.html"] +tags = "trackingprotection" + +["test_reporturl.html"] +skip-if = ["verify"] + +["test_safebrowsing_bug1272239.html"] + +["test_threathit_report.html"] +skip-if = ["verify"] + +["test_trackingprotection_bug1157081.html"] +tags = "trackingprotection" + +["test_trackingprotection_bug1312515.html"] + +["test_trackingprotection_bug1580416.html"] +tags = "trackingprotection" + +["test_trackingprotection_whitelist.html"] +tags = "trackingprotection" diff --git a/toolkit/components/url-classifier/tests/moz.build b/toolkit/components/url-classifier/tests/moz.build index 26ad62da5201..b3bc99feb8b3 100644 --- a/toolkit/components/url-classifier/tests/moz.build +++ b/toolkit/components/url-classifier/tests/moz.build @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. MOCHITEST_MANIFESTS += ["mochitest/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["mochitest/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["mochitest/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["unit/xpcshell.ini"] BROWSER_CHROME_MANIFESTS += ["browser/browser.ini"] diff --git a/toolkit/components/viewsource/moz.build b/toolkit/components/viewsource/moz.build index 1f13fe6e56a6..e22eed07e853 100644 --- a/toolkit/components/viewsource/moz.build +++ b/toolkit/components/viewsource/moz.build @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"] -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] JAR_MANIFESTS += ["jar.mn"] diff --git a/toolkit/components/viewsource/test/chrome.ini b/toolkit/components/viewsource/test/chrome.ini deleted file mode 100644 index bd013ab6c979..000000000000 --- a/toolkit/components/viewsource/test/chrome.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] - -[test_bug428653.html] -support-files = file_empty.html diff --git a/toolkit/components/viewsource/test/chrome.toml b/toolkit/components/viewsource/test/chrome.toml new file mode 100644 index 000000000000..8d2b09ad4918 --- /dev/null +++ b/toolkit/components/viewsource/test/chrome.toml @@ -0,0 +1,4 @@ +[DEFAULT] + +["test_bug428653.html"] +support-files = ["file_empty.html"] diff --git a/toolkit/components/windowcreator/test/chrome.ini b/toolkit/components/windowcreator/test/chrome.ini deleted file mode 100644 index 9954dde5915c..000000000000 --- a/toolkit/components/windowcreator/test/chrome.ini +++ /dev/null @@ -1,11 +0,0 @@ -[DEFAULT] -support-files = - 320x240.ogv - bug449141_page.html - bug1170334_iframe.xml - bug1170334_style.css - -[test_bug449141.html] -skip-if = toolkit == 'android' -[test_bug1170334_wbp_xmlstyle.html] -[test_bug1192654.html] diff --git a/toolkit/components/windowcreator/test/chrome.toml b/toolkit/components/windowcreator/test/chrome.toml new file mode 100644 index 000000000000..b9fc174fd612 --- /dev/null +++ b/toolkit/components/windowcreator/test/chrome.toml @@ -0,0 +1,14 @@ +[DEFAULT] +support-files = [ + "320x240.ogv", + "bug449141_page.html", + "bug1170334_iframe.xml", + "bug1170334_style.css", +] + +["test_bug1170334_wbp_xmlstyle.html"] + +["test_bug1192654.html"] + +["test_bug449141.html"] +skip-if = ["toolkit == 'android'"] diff --git a/toolkit/components/windowcreator/test/moz.build b/toolkit/components/windowcreator/test/moz.build index bef136aaef87..50542bb425a8 100644 --- a/toolkit/components/windowcreator/test/moz.build +++ b/toolkit/components/windowcreator/test/moz.build @@ -5,5 +5,5 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. MOCHITEST_MANIFESTS += ["mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["chrome.toml"] BROWSER_CHROME_MANIFESTS += ["browser.ini"] diff --git a/toolkit/components/windowwatcher/test/chrome.ini b/toolkit/components/windowwatcher/test/chrome.ini deleted file mode 100644 index 91d33be63370..000000000000 --- a/toolkit/components/windowwatcher/test/chrome.ini +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -tags = openwindow - -[test_alwaysOnTop_windows.html] -skip-if = os != "win" -[test_dialog_arguments.html] -support-files = - file_test_dialog.html -[test_modal_windows.html] diff --git a/toolkit/components/windowwatcher/test/chrome.toml b/toolkit/components/windowwatcher/test/chrome.toml new file mode 100644 index 000000000000..24dd1019d711 --- /dev/null +++ b/toolkit/components/windowwatcher/test/chrome.toml @@ -0,0 +1,10 @@ +[DEFAULT] +tags = "openwindow" + +["test_alwaysOnTop_windows.html"] +skip-if = ["os != 'win'"] + +["test_dialog_arguments.html"] +support-files = ["file_test_dialog.html"] + +["test_modal_windows.html"] diff --git a/toolkit/components/windowwatcher/test/moz.build b/toolkit/components/windowwatcher/test/moz.build index 7b61855c01ff..e0a65daf5078 100644 --- a/toolkit/components/windowwatcher/test/moz.build +++ b/toolkit/components/windowwatcher/test/moz.build @@ -13,5 +13,5 @@ MOCHITEST_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "chrome.ini", + "chrome.toml", ] diff --git a/toolkit/components/workerloader/moz.build b/toolkit/components/workerloader/moz.build index cb8dcdaab5af..8e20e1d61ba0 100644 --- a/toolkit/components/workerloader/moz.build +++ b/toolkit/components/workerloader/moz.build @@ -4,7 +4,7 @@ # 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_MANIFESTS += ["tests/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.toml"] EXTRA_JS_MODULES.workers += ["require.js"] diff --git a/toolkit/components/workerloader/tests/chrome.ini b/toolkit/components/workerloader/tests/chrome.ini deleted file mode 100644 index c4aa9ec16932..000000000000 --- a/toolkit/components/workerloader/tests/chrome.ini +++ /dev/null @@ -1,17 +0,0 @@ -[DEFAULT] -support-files = - moduleA-depends.js - moduleB-dependency.js - moduleC-circular.js - moduleD-circular.js - moduleE-throws-during-require.js - moduleF-syntax-error.js - moduleG-throws-later.js - moduleH-module-dot-exports.js - moduleI-depends.js - moduleJ-dependency.js - utils_mainthread.js - utils_worker.js - worker_test_loading.js - -[test_loading.xhtml] diff --git a/toolkit/components/workerloader/tests/chrome.toml b/toolkit/components/workerloader/tests/chrome.toml new file mode 100644 index 000000000000..653491e05c0e --- /dev/null +++ b/toolkit/components/workerloader/tests/chrome.toml @@ -0,0 +1,18 @@ +[DEFAULT] +support-files = [ + "moduleA-depends.js", + "moduleB-dependency.js", + "moduleC-circular.js", + "moduleD-circular.js", + "moduleE-throws-during-require.js", + "moduleF-syntax-error.js", + "moduleG-throws-later.js", + "moduleH-module-dot-exports.js", + "moduleI-depends.js", + "moduleJ-dependency.js", + "utils_mainthread.js", + "utils_worker.js", + "worker_test_loading.js", +] + +["test_loading.xhtml"] diff --git a/toolkit/components/xulstore/moz.build b/toolkit/components/xulstore/moz.build index eebaef5baf9f..13f9cf10db80 100644 --- a/toolkit/components/xulstore/moz.build +++ b/toolkit/components/xulstore/moz.build @@ -7,7 +7,7 @@ with Files("**"): BUG_COMPONENT = ("Toolkit", "Startup and Profile System") -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"] XPIDL_MODULE = "toolkit_xulstore" diff --git a/toolkit/components/xulstore/tests/chrome/chrome.ini b/toolkit/components/xulstore/tests/chrome/chrome.ini deleted file mode 100644 index c8f4ddf073d8..000000000000 --- a/toolkit/components/xulstore/tests/chrome/chrome.ini +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -support-files = - window_persistence.xhtml - -[test_persistence.xhtml] diff --git a/toolkit/components/xulstore/tests/chrome/chrome.toml b/toolkit/components/xulstore/tests/chrome/chrome.toml new file mode 100644 index 000000000000..96757997817b --- /dev/null +++ b/toolkit/components/xulstore/tests/chrome/chrome.toml @@ -0,0 +1,4 @@ +[DEFAULT] +support-files = ["window_persistence.xhtml"] + +["test_persistence.xhtml"] diff --git a/toolkit/content/tests/chrome/chrome.ini b/toolkit/content/tests/chrome/chrome.ini deleted file mode 100644 index bf55904dfb89..000000000000 --- a/toolkit/content/tests/chrome/chrome.ini +++ /dev/null @@ -1,219 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - ../widgets/popup_shared.js - ../widgets/tree_shared.js - RegisterUnregisterChrome.js - bug263683_window.xhtml - bug304188_window.xhtml - bug331215_window.xhtml - bug360437_window.xhtml - bug366992_window.xhtml - bug409624_window.xhtml - bug429723_window.xhtml - bug624329_window.xhtml - dialog_button.xhtml - dialog_dialogfocus.xhtml - dialog_dialogfocus2.xhtml - file_empty.xhtml - file_edit_contextmenu.xhtml - file_about_networking_wsh.py - file_autocomplete_with_composition.js - file_editor_with_autocomplete.js - findbar_entireword_window.xhtml - findbar_events_window.xhtml - findbar_window.xhtml - frame_popup_anchor.xhtml - frame_subframe_origin_subframe1.xhtml - frame_subframe_origin_subframe2.xhtml - popup_trigger.js - sample_entireword_latin1.html - window_browser_drop.xhtml - window_keys.xhtml - window_largemenu.xhtml - window_panel.xhtml - window_panel_anchoradjust.xhtml - window_popup_anchor.xhtml - window_popup_anchoratrect.xhtml - window_popup_attribute.xhtml - window_popup_button.xhtml - window_popup_preventdefault_chrome.xhtml - window_preferences.xhtml - window_preferences2.xhtml - window_preferences3.xhtml - window_preferences_commandretarget.xhtml - window_preferences_disabled.xhtml - window_screenPosSize.xhtml - window_showcaret.xhtml - window_subframe_origin.xhtml - window_tooltip.xhtml - xul_selectcontrol.js -prefs = - gfx.font_rendering.fallback.async=false - widget.non-native-theme.enabled=false - -[test_about_networking.html] -[test_arrowpanel.xhtml] -skip-if = - os == "win" && verify - debug && os == "win" && bits == 32 # Bug 1546256 - win10_2004 # Bug 1727507 - win10_2009 # Bug 1727507 - win11_2009 # Bug 1797751 -[test_autocomplete2.xhtml] -[test_autocomplete3.xhtml] -[test_autocomplete4.xhtml] -[test_autocomplete5.xhtml] -[test_autocomplete_emphasis.xhtml] -[test_autocomplete_with_composition_on_input.html] -[test_autocomplete_placehold_last_complete.xhtml] -[test_browser_drop.xhtml] -[test_bug263683.xhtml] -skip-if = debug && (os == 'win' || os == 'linux') -[test_bug304188.xhtml] -skip-if = true -[test_bug331215.xhtml] -skip-if = true # Bug 1339326 #Bug 1582327 -[test_bug360220.xhtml] -[test_bug360437.xhtml] -skip-if = true # Bug 1264604 # Bug 1784826 -[test_bug365773.xhtml] -[test_bug366992.xhtml] -[test_bug382990.xhtml] -[test_bug409624.xhtml] -[test_bug418874.xhtml] -[test_bug429723.xhtml] -[test_bug451540.xhtml] -support-files = bug451540_window.xhtml -[test_bug457632.xhtml] -[test_bug460942.xhtml] -[test_bug471776.xhtml] -[test_bug509732.xhtml] -[test_bug557987.xhtml] -[test_bug562554.xhtml] -[test_bug624329.xhtml] -fail-if = (os == 'linux' && os_version == '18.04') # Bug 1600194 -[test_bug792324.xhtml] -[test_bug1048178.xhtml] -skip-if = - toolkit == "cocoa" -[test_button.xhtml] -[test_closemenu_attribute.xhtml] -[test_contextmenu_list.xhtml] -[test_contextmenu_rtl.xhtml] -[test_custom_element_base.xhtml] -[test_custom_element_delay_connection.xhtml] -[test_custom_element_parts.html] -[test_deck.xhtml] -[test_dialog_button.xhtml] -[test_dialogfocus.xhtml] -[test_edit_contextmenu.html] -[test_editor_for_input_with_autocomplete.html] -[test_findbar.xhtml] -skip-if = os == 'mac' && os_version == '10.15' # macosx1014/15 due to 1550078 -[test_findbar_entireword.xhtml] -[test_findbar_events.xhtml] -[test_frames.xhtml] -[test_hiddenitems.xhtml] -[test_hiddenpaging.xhtml] -[test_keys.xhtml] -[test_labelcontrol.xhtml] -[test_largemenu.html] -skip-if = os == 'linux' && !debug # Bug 1207174 -[test_maximized_persist.xhtml] -support-files = - window_maximized_persist.xhtml - file_maximized_persist.js -[test_maximized_persist_with_no_titlebar.xhtml] -support-files = - window_maximized_persist_with_no_titlebar.xhtml - file_maximized_persist.js -[test_navigate_persist.html] -support-files = window_navigate_persist.html -[test_menu.xhtml] -[test_menu_activateitem.xhtml] -[test_menu_mouse_menuactive.xhtml] -[test_menu_withcapture.xhtml] -[test_menu_hide.xhtml] -[test_menuchecks.xhtml] -[test_menuitem_blink.xhtml] -[test_menuitem_commands.xhtml] -[test_menulist.xhtml] -[test_menulist_keynav.xhtml] -[test_menulist_null_value.xhtml] -[test_menulist_paging.xhtml] -[test_menulist_position.xhtml] -[test_menulist_in_popup.xhtml] -[test_mousescroll.xhtml] -[test_mozinputbox_dictionary.xhtml] -[test_named_deck.html] -[test_notificationbox.xhtml] -skip-if = (os == 'linux' && debug) || (os == 'win') # Bug 1429649 -[test_panel.xhtml] -skip-if = os == 'mac' && os_version == '10.15' # macosx1014 due to 1550078 -[test_panel_anchoradjust.xhtml] -[test_panel_open.xhtml] -[test_panelfrommenu.xhtml] -[test_popup_anchor.xhtml] -[test_popup_anchoratrect.xhtml] -skip-if = os == 'linux' # 1167694 -[test_popup_attribute.xhtml] -skip-if = (os == 'linux' && asan) || (os == 'mac' && debug) # Bug 1281360, 1582610 -[test_popup_button.xhtml] -skip-if = (os == 'linux' && asan) || (os == 'mac' && debug) # Bug 1281360, 1582610 -[test_popup_coords.xhtml] -[test_popup_keys.xhtml] -[test_popup_moveToAnchor.xhtml] -[test_popup_preventdefault.xhtml] -[test_popup_preventdefault_chrome.xhtml] -[test_popup_recreate.xhtml] -[test_popup_scaled.xhtml] -[test_popup_tree.xhtml] -[test_popuphidden.xhtml] -[test_popupincontent.xhtml] -skip-if = (verify && (os == 'win')) -[test_popupremoving.xhtml] -[test_position.xhtml] -[test_preferences.xhtml] -[test_preferences_beforeaccept.xhtml] -support-files = window_preferences_beforeaccept.xhtml -[test_preferences_onsyncfrompreference.xhtml] -support-files = window_preferences_onsyncfrompreference.xhtml -[test_props.xhtml] -[test_radio.xhtml] -[test_richlistbox.xhtml] -[test_screenPersistence.xhtml] -[test_scrollbar.xhtml] -[test_showcaret.xhtml] -[test_subframe_origin.xhtml] -[test_tabbox.xhtml] -[test_tabindex.xhtml] -[test_textbox_search.xhtml] -[test_tooltip.xhtml] -skip-if = (os == 'mac' || os == 'win') # Bug 1141245, frequent timeouts on OSX 10.14, Windows -[test_tooltip_noautohide.xhtml] -[test_tree.xhtml] -[test_tree_hier.xhtml] -[test_tree_scroll.xhtml] -support-files = - !/gfx/layers/apz/test/mochitest/apz_test_utils.js - !/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js -[test_tree_single.xhtml] -[test_tree_view.xhtml] -[test_window_intrinsic_size.xhtml] -support-files = window_intrinsic_size.xhtml -# test_panel_focus.xhtml won't work if the Full Keyboard Access preference is set to -# textboxes and lists only, so skip this test on Mac -[test_panel_focus.xhtml] -support-files = window_panel_focus.xhtml -skip-if = toolkit == "cocoa" -[test_panel_hover_menu.xhtml] -[test_chromemargin.xhtml] -support-files = window_chromemargin.xhtml -skip-if = toolkit == "cocoa" -[test_autocomplete_mac_caret.xhtml] -skip-if = toolkit != "cocoa" -[test_cursorsnap.xhtml] -disabled = -#skip-if = os != "win" -support-files = window_cursorsnap_dialog.xhtml window_cursorsnap_wizard.xhtml diff --git a/toolkit/content/tests/chrome/chrome.toml b/toolkit/content/tests/chrome/chrome.toml new file mode 100644 index 000000000000..9c37b87d1d99 --- /dev/null +++ b/toolkit/content/tests/chrome/chrome.toml @@ -0,0 +1,354 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "../widgets/popup_shared.js", + "../widgets/tree_shared.js", + "RegisterUnregisterChrome.js", + "bug263683_window.xhtml", + "bug304188_window.xhtml", + "bug331215_window.xhtml", + "bug360437_window.xhtml", + "bug366992_window.xhtml", + "bug409624_window.xhtml", + "bug429723_window.xhtml", + "bug624329_window.xhtml", + "dialog_button.xhtml", + "dialog_dialogfocus.xhtml", + "dialog_dialogfocus2.xhtml", + "file_empty.xhtml", + "file_edit_contextmenu.xhtml", + "file_about_networking_wsh.py", + "file_autocomplete_with_composition.js", + "file_editor_with_autocomplete.js", + "findbar_entireword_window.xhtml", + "findbar_events_window.xhtml", + "findbar_window.xhtml", + "frame_popup_anchor.xhtml", + "frame_subframe_origin_subframe1.xhtml", + "frame_subframe_origin_subframe2.xhtml", + "popup_trigger.js", + "sample_entireword_latin1.html", + "window_browser_drop.xhtml", + "window_keys.xhtml", + "window_largemenu.xhtml", + "window_panel.xhtml", + "window_panel_anchoradjust.xhtml", + "window_popup_anchor.xhtml", + "window_popup_anchoratrect.xhtml", + "window_popup_attribute.xhtml", + "window_popup_button.xhtml", + "window_popup_preventdefault_chrome.xhtml", + "window_preferences.xhtml", + "window_preferences2.xhtml", + "window_preferences3.xhtml", + "window_preferences_commandretarget.xhtml", + "window_preferences_disabled.xhtml", + "window_screenPosSize.xhtml", + "window_showcaret.xhtml", + "window_subframe_origin.xhtml", + "window_tooltip.xhtml", + "xul_selectcontrol.js", +] +prefs = [ + "gfx.font_rendering.fallback.async=false", + "widget.non-native-theme.enabled=false", +] + +["test_about_networking.html"] + +["test_arrowpanel.xhtml"] +skip-if = [ + "os == 'win' && verify", + "debug && os == 'win' && bits == 32", # Bug 1546256 + "win10_2004", # Bug 1727507 + "win10_2009", # Bug 1727507 + "win11_2009", # Bug 1797751 +] + +["test_autocomplete2.xhtml"] + +["test_autocomplete3.xhtml"] + +["test_autocomplete4.xhtml"] + +["test_autocomplete5.xhtml"] + +["test_autocomplete_emphasis.xhtml"] + +["test_autocomplete_mac_caret.xhtml"] +skip-if = ["toolkit != 'cocoa'"] + +["test_autocomplete_placehold_last_complete.xhtml"] + +["test_autocomplete_with_composition_on_input.html"] + +["test_browser_drop.xhtml"] + +["test_bug1048178.xhtml"] +skip-if = ["toolkit == 'cocoa'"] + +["test_bug263683.xhtml"] +skip-if = ["debug && (os == 'win' || os == 'linux')"] + +["test_bug304188.xhtml"] +skip-if = ["true"] + +["test_bug331215.xhtml"] +skip-if = ["true"] # Bug 1339326 #Bug 1582327 + +["test_bug360220.xhtml"] + +["test_bug360437.xhtml"] +skip-if = ["true"] # Bug 1264604 # Bug 1784826 + +["test_bug365773.xhtml"] + +["test_bug366992.xhtml"] + +["test_bug382990.xhtml"] + +["test_bug409624.xhtml"] + +["test_bug418874.xhtml"] + +["test_bug429723.xhtml"] + +["test_bug451540.xhtml"] +support-files = ["bug451540_window.xhtml"] + +["test_bug457632.xhtml"] + +["test_bug460942.xhtml"] + +["test_bug471776.xhtml"] + +["test_bug509732.xhtml"] + +["test_bug557987.xhtml"] + +["test_bug562554.xhtml"] + +["test_bug624329.xhtml"] +fail-if = ["(os == 'linux' && os_version == '18.04')"] # Bug 1600194 + +["test_bug792324.xhtml"] + +["test_button.xhtml"] + +["test_chromemargin.xhtml"] +support-files = "window_chromemargin.xhtml" +skip-if = ["toolkit == 'cocoa'"] + +["test_closemenu_attribute.xhtml"] + +["test_contextmenu_list.xhtml"] + +["test_contextmenu_rtl.xhtml"] + +["test_cursorsnap.xhtml"] +disabled = true # INI file had 'disabled = ' +#skip-if = os != 'win' +support-files = [ + "window_cursorsnap_dialog.xhtml", + "window_cursorsnap_wizard.xhtml", +] + +["test_custom_element_base.xhtml"] + +["test_custom_element_delay_connection.xhtml"] + +["test_custom_element_parts.html"] + +["test_deck.xhtml"] + +["test_dialog_button.xhtml"] + +["test_dialogfocus.xhtml"] + +["test_edit_contextmenu.html"] + +["test_editor_for_input_with_autocomplete.html"] + +["test_findbar.xhtml"] +skip-if = ["os == 'mac' && os_version == '10.15'"] # macosx1014/15 due to 1550078 + +["test_findbar_entireword.xhtml"] + +["test_findbar_events.xhtml"] + +["test_frames.xhtml"] + +["test_hiddenitems.xhtml"] + +["test_hiddenpaging.xhtml"] + +["test_keys.xhtml"] + +["test_labelcontrol.xhtml"] + +["test_largemenu.html"] +skip-if = ["os == 'linux' && !debug"] # Bug 1207174 + +["test_maximized_persist.xhtml"] +support-files = [ + "window_maximized_persist.xhtml", + "file_maximized_persist.js", +] + +["test_maximized_persist_with_no_titlebar.xhtml"] +support-files = [ + "window_maximized_persist_with_no_titlebar.xhtml", + "file_maximized_persist.js", +] + +["test_menu.xhtml"] + +["test_menu_activateitem.xhtml"] + +["test_menu_hide.xhtml"] + +["test_menu_mouse_menuactive.xhtml"] + +["test_menu_withcapture.xhtml"] + +["test_menuchecks.xhtml"] + +["test_menuitem_blink.xhtml"] + +["test_menuitem_commands.xhtml"] + +["test_menulist.xhtml"] + +["test_menulist_in_popup.xhtml"] + +["test_menulist_keynav.xhtml"] + +["test_menulist_null_value.xhtml"] + +["test_menulist_paging.xhtml"] + +["test_menulist_position.xhtml"] + +["test_mousescroll.xhtml"] + +["test_mozinputbox_dictionary.xhtml"] + +["test_named_deck.html"] + +["test_navigate_persist.html"] +support-files = ["window_navigate_persist.html"] + +["test_notificationbox.xhtml"] +skip-if = ["(os == 'linux' && debug) || (os == 'win')"] # Bug 1429649 + +["test_panel.xhtml"] +skip-if = ["os == 'mac' && os_version == '10.15'"] # macosx1014 due to 1550078 + +["test_panel_anchoradjust.xhtml"] + +# test_panel_focus.xhtml won't work if the Full Keyboard Access preference is set to +# textboxes and lists only, so skip this test on Mac +["test_panel_focus.xhtml"] +support-files = "window_panel_focus.xhtml" +skip-if = ["toolkit == 'cocoa'"] + +["test_panel_hover_menu.xhtml"] + +["test_panel_open.xhtml"] + +["test_panelfrommenu.xhtml"] + +["test_popup_anchor.xhtml"] + +["test_popup_anchoratrect.xhtml"] +skip-if = ["os == 'linux'"] # 1167694 + +["test_popup_attribute.xhtml"] +skip-if = [ + "os == 'linux' && asan", # Bug 1582610 + "os == 'mac' && debug", # Bug 1281360 +] + +["test_popup_button.xhtml"] +skip-if = [ + "os == 'linux' && asan", # Bug 1582610 + "os == 'mac' && debug", # Bug 1281360 +] + +["test_popup_coords.xhtml"] + +["test_popup_keys.xhtml"] + +["test_popup_moveToAnchor.xhtml"] + +["test_popup_preventdefault.xhtml"] + +["test_popup_preventdefault_chrome.xhtml"] + +["test_popup_recreate.xhtml"] + +["test_popup_scaled.xhtml"] + +["test_popup_tree.xhtml"] + +["test_popuphidden.xhtml"] + +["test_popupincontent.xhtml"] +skip-if = ["verify && os == 'win'"] + +["test_popupremoving.xhtml"] + +["test_position.xhtml"] + +["test_preferences.xhtml"] + +["test_preferences_beforeaccept.xhtml"] +support-files = ["window_preferences_beforeaccept.xhtml"] + +["test_preferences_onsyncfrompreference.xhtml"] +support-files = ["window_preferences_onsyncfrompreference.xhtml"] + +["test_props.xhtml"] + +["test_radio.xhtml"] + +["test_richlistbox.xhtml"] + +["test_screenPersistence.xhtml"] + +["test_scrollbar.xhtml"] + +["test_showcaret.xhtml"] + +["test_subframe_origin.xhtml"] + +["test_tabbox.xhtml"] + +["test_tabindex.xhtml"] + +["test_textbox_search.xhtml"] + +["test_tooltip.xhtml"] +skip-if = [ + "os == 'mac'", # Bug 1141245, frequent timeouts on OSX 10.14, Windows + "os == 'win'", # Bug 1141245, frequent timeouts on OSX 10.14, Windows +] + +["test_tooltip_noautohide.xhtml"] + +["test_tree.xhtml"] + +["test_tree_hier.xhtml"] + +["test_tree_scroll.xhtml"] +support-files = [ + "!/gfx/layers/apz/test/mochitest/apz_test_utils.js", + "!/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js", +] + +["test_tree_single.xhtml"] + +["test_tree_view.xhtml"] + +["test_window_intrinsic_size.xhtml"] +support-files = ["window_intrinsic_size.xhtml"] diff --git a/toolkit/content/tests/moz.build b/toolkit/content/tests/moz.build index 41c16ddfe901..0d7221019066 100644 --- a/toolkit/content/tests/moz.build +++ b/toolkit/content/tests/moz.build @@ -12,8 +12,8 @@ BROWSER_CHROME_MANIFESTS += [ ] MOCHITEST_CHROME_MANIFESTS += [ - "chrome/chrome.ini", - "widgets/chrome.ini", + "chrome/chrome.toml", + "widgets/chrome.toml", ] MOCHITEST_MANIFESTS += [ diff --git a/toolkit/content/tests/widgets/chrome.ini b/toolkit/content/tests/widgets/chrome.ini deleted file mode 100644 index 4ad0fc74a17f..000000000000 --- a/toolkit/content/tests/widgets/chrome.ini +++ /dev/null @@ -1,48 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - image.png - image-zh.png - tree_shared.js - popup_shared.js - window_label_checkbox.xhtml - window_menubar.xhtml - seek_with_sound.ogg -prefs = - app.support.baseURL='https://support.mozilla.org/' - -[test_contextmenu_menugroup.xhtml] -skip-if = os == 'linux' # Bug 1115088 -[test_contextmenu_nested.xhtml] -skip-if = os == 'linux' # Bug 1116215 -[test_editor_currentURI.xhtml] -[test_image_recognition.html] -run-if = os == "mac" # Mac only feature. -[test_image_recognition_unsupported.html] -skip-if = os == 'mac' -[test_image_recognition_zh.html] -run-if = os == "mac" && os_version != "10.15" # Mac only feature, requires > 10.15 to support multilingual results. -[test_label_checkbox.xhtml] -[test_menubar.xhtml] -skip-if = os == 'mac' -[test_moz_button_group.html] -[test_moz_five_star.html] -[test_moz_label.html] -[test_moz_message_bar.html] -[test_moz_support_link.html] -[test_moz_toggle.html] -[test_panel_item_accesskey.html] -[test_panel_list_accessibility.html] -[test_panel_list_anchoring.html] -[test_panel_list_in_xul_panel.html] -[test_panel_list_min_width_from_anchor.html] -[test_popupanchor.xhtml] -skip-if = os == 'linux' || (verify && (os == 'win')) # Bug 1335894 perma-fail on linux 16.04 -[test_popupreflows.xhtml] -[test_tree_column_reorder.xhtml] -[test_videocontrols_focus.html] -support-files = - head.js - video.ogg -skip-if = toolkit == 'android' -[test_videocontrols_onclickplay.html] diff --git a/toolkit/content/tests/widgets/chrome.toml b/toolkit/content/tests/widgets/chrome.toml new file mode 100644 index 000000000000..072d97a3c9ad --- /dev/null +++ b/toolkit/content/tests/widgets/chrome.toml @@ -0,0 +1,72 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "image.png", + "image-zh.png", + "tree_shared.js", + "popup_shared.js", + "window_label_checkbox.xhtml", + "window_menubar.xhtml", + "seek_with_sound.ogg", +] +prefs = ["app.support.baseURL='https://support.mozilla.org/'"] + +["test_contextmenu_menugroup.xhtml"] +skip-if = ["os == 'linux'"] # Bug 1115088 + +["test_contextmenu_nested.xhtml"] +skip-if = ["os == 'linux'"] # Bug 1116215 + +["test_editor_currentURI.xhtml"] + +["test_image_recognition.html"] +run-if = ["os == 'mac'"] # Mac only feature. + +["test_image_recognition_unsupported.html"] +skip-if = ["os == 'mac'"] + +["test_image_recognition_zh.html"] +run-if = ["os == 'mac' && os_version != '10.15'"] # Mac only feature, requires > 10.15 to support multilingual results. + +["test_label_checkbox.xhtml"] + +["test_menubar.xhtml"] +skip-if = ["os == 'mac'"] + +["test_moz_button_group.html"] + +["test_moz_five_star.html"] + +["test_moz_label.html"] + +["test_moz_message_bar.html"] + +["test_moz_support_link.html"] + +["test_moz_toggle.html"] + +["test_panel_item_accesskey.html"] + +["test_panel_list_accessibility.html"] + +["test_panel_list_anchoring.html"] + +["test_panel_list_in_xul_panel.html"] + +["test_panel_list_min_width_from_anchor.html"] + +["test_popupanchor.xhtml"] +skip-if = ["os == 'linux' || (verify && (os == 'win'))"] # Bug 1335894 perma-fail on linux 16.04 + +["test_popupreflows.xhtml"] + +["test_tree_column_reorder.xhtml"] + +["test_videocontrols_focus.html"] +support-files = [ + "head.js", + "video.ogg", +] +skip-if = ["toolkit == 'android'"] + +["test_videocontrols_onclickplay.html"] diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index a171e7c48961..b98b5ade84d7 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -129,7 +129,7 @@ with Files("WindowsRegistry.sys.mjs"): XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"] BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"] -MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] TESTING_JS_MODULES += [ "tests/modules/MockDocument.sys.mjs", diff --git a/toolkit/modules/tests/chrome/chrome.ini b/toolkit/modules/tests/chrome/chrome.ini deleted file mode 100644 index f302fbdb81e9..000000000000 --- a/toolkit/modules/tests/chrome/chrome.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] - -[test_bug544442_checkCert.xhtml] -skip-if = verify diff --git a/toolkit/modules/tests/chrome/chrome.toml b/toolkit/modules/tests/chrome/chrome.toml new file mode 100644 index 000000000000..30d484a62be5 --- /dev/null +++ b/toolkit/modules/tests/chrome/chrome.toml @@ -0,0 +1,4 @@ +[DEFAULT] + +["test_bug544442_checkCert.xhtml"] +skip-if = ["verify"] diff --git a/toolkit/mozapps/extensions/test/mochitest/chrome.ini b/toolkit/mozapps/extensions/test/mochitest/chrome.ini deleted file mode 100644 index a8a8d49e3c56..000000000000 --- a/toolkit/mozapps/extensions/test/mochitest/chrome.ini +++ /dev/null @@ -1,2 +0,0 @@ - -[test_default_theme.html] diff --git a/toolkit/mozapps/extensions/test/mochitest/chrome.toml b/toolkit/mozapps/extensions/test/mochitest/chrome.toml new file mode 100644 index 000000000000..607667ee57f6 --- /dev/null +++ b/toolkit/mozapps/extensions/test/mochitest/chrome.toml @@ -0,0 +1,3 @@ +[DEFAULT] + +["test_default_theme.html"] diff --git a/toolkit/mozapps/extensions/test/moz.build b/toolkit/mozapps/extensions/test/moz.build index fe77aa6dd8b9..197dd126cf01 100644 --- a/toolkit/mozapps/extensions/test/moz.build +++ b/toolkit/mozapps/extensions/test/moz.build @@ -8,7 +8,7 @@ DIRS += ["browser"] BROWSER_CHROME_MANIFESTS += ["xpinstall/browser.ini"] MOCHITEST_MANIFESTS += ["mochitest/mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["mochitest/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["mochitest/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += [ "xpcshell/rs-blocklist/xpcshell.ini", diff --git a/toolkit/profile/moz.build b/toolkit/profile/moz.build index 5db18a2b73c3..96727204f281 100644 --- a/toolkit/profile/moz.build +++ b/toolkit/profile/moz.build @@ -4,7 +4,7 @@ # 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_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] XPCSHELL_TESTS_MANIFESTS += ["xpcshell/xpcshell.ini"] diff --git a/toolkit/profile/test/chrome.ini b/toolkit/profile/test/chrome.ini deleted file mode 100644 index 9d27de238ef5..000000000000 --- a/toolkit/profile/test/chrome.ini +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] - -[test_create_profile.xhtml] diff --git a/toolkit/profile/test/chrome.toml b/toolkit/profile/test/chrome.toml new file mode 100644 index 000000000000..c59a75ea675a --- /dev/null +++ b/toolkit/profile/test/chrome.toml @@ -0,0 +1,3 @@ +[DEFAULT] + +["test_create_profile.xhtml"] diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build index 89ddfc466cc7..de362493a865 100644 --- a/tools/profiler/moz.build +++ b/tools/profiler/moz.build @@ -141,7 +141,7 @@ if CONFIG["MOZ_GECKO_PROFILER"]: ] XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"] - MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"] + MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"] UNIFIED_SOURCES += [ diff --git a/tools/profiler/tests/chrome/chrome.ini b/tools/profiler/tests/chrome/chrome.ini deleted file mode 100644 index 7089b8fb8e74..000000000000 --- a/tools/profiler/tests/chrome/chrome.ini +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -skip-if = tsan # Bug 1804081 -support-files=profiler_test_utils.js - -[test_profile_worker_bug_1428076.html] -skip-if = os == 'android' && processor == 'arm' # Bug 1541291 -[test_profile_worker.html] -skip-if = os == 'android' && processor == 'arm' # Bug 1541291 diff --git a/tools/profiler/tests/chrome/chrome.toml b/tools/profiler/tests/chrome/chrome.toml new file mode 100644 index 000000000000..905d1ffff36e --- /dev/null +++ b/tools/profiler/tests/chrome/chrome.toml @@ -0,0 +1,9 @@ +[DEFAULT] +skip-if = ["tsan"] # Bug 1804081 +support-files = ["profiler_test_utils.js"] + +["test_profile_worker.html"] +skip-if = ["os == 'android' && processor == 'arm'"] # Bug 1541291 + +["test_profile_worker_bug_1428076.html"] +skip-if = ["os == 'android' && processor == 'arm'"] # Bug 1541291 diff --git a/widget/tests/chrome.ini b/widget/tests/chrome.ini deleted file mode 100644 index 1fa3b7b7b4ae..000000000000 --- a/widget/tests/chrome.ini +++ /dev/null @@ -1,136 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - empty_window.xhtml - clipboard_helper.js - -[test_alwaysontop_focus.xhtml] - -# Privacy relevant -[test_bug1123480.xhtml] -skip-if = os == "win" && bits == 32 - -[test_bug343416.xhtml] -skip-if = debug -[test_bug413277.html] -skip-if = toolkit != "cocoa" # Cocoa widget test -[test_bug428405.xhtml] -skip-if = toolkit != "cocoa" # Cocoa widget test -[test_bug429954.xhtml] -support-files = window_bug429954.xhtml -[test_bug444800.xhtml] -[test_bug466599.xhtml] -skip-if = toolkit != "cocoa" # Cocoa widget test -[test_bug478536.xhtml] -skip-if = true # Bug 561929 -support-files = window_bug478536.xhtml -[test_bug485118.xhtml] -skip-if = toolkit != "cocoa" # Cocoa widget test -[test_bug517396.xhtml] -skip-if = (verify && (os == 'win')) -[test_bug522217.xhtml] -tags = fullscreen -skip-if = toolkit != "cocoa" # Cocoa widget test -support-files = window_bug522217.xhtml -[test_bug538242.xhtml] -support-files = window_bug538242.xhtml -[test_bug565392.html] -skip-if = toolkit != "windows" -[test_bug586713.xhtml] -skip-if = toolkit != "cocoa" # Cocoa widget test -support-files = bug586713_window.xhtml -[test_bug593307.xhtml] -support-files = window_bug593307_offscreen.xhtml window_bug593307_centerscreen.xhtml -[test_bug596600.xhtml] -support-files = file_bug596600.html -skip-if = toolkit != "cocoa" # Cocoa widget test -[test_bug673301.xhtml] -skip-if = toolkit != "cocoa" # Cocoa widget test -[test_bug760802.xhtml] -[test_clipboard.xhtml] -[test_clipboard_asyncSetData.xhtml] -[test_clipboard_cache.xhtml] -[test_clipboard_owner.xhtml] -[test_composition_text_querycontent.xhtml] -support-files = window_composition_text_querycontent.xhtml -[test_ime_state_in_contenteditable_on_readonly_change_in_parent.html] -support-files = - file_ime_state_test_helper.js - file_test_ime_state_in_contenteditable_on_readonly_change.js -[test_ime_state_in_plugin_in_parent.html] -support-files = - file_ime_state_test_helper.js -[test_ime_state_in_text_control_on_reframe_in_parent.html] -support-files = - file_ime_state_test_helper.js - file_test_ime_state_in_text_control_on_reframe.js -[test_ime_state_on_editable_state_change_in_parent.html] -support-files = - file_ime_state_test_helper.js -[test_ime_state_on_focus_move_in_parent.html] -support-files = - file_ime_state_test_helper.js - file_test_ime_state_on_focus_move.js -[test_ime_state_on_input_type_change_in_parent.html] -skip-if = true # Bug 1817704 -support-files = - file_ime_state_test_helper.js - file_test_ime_state_on_input_type_change.js -[test_ime_state_on_readonly_change_in_parent.html] -support-files = - file_ime_state_test_helper.js - file_test_ime_state_on_readonly_change.js -[test_ime_state_others_in_parent.html] -support-files = window_imestate_iframes.html -[test_input_events_on_deactive_window.xhtml] -support-files = file_input_events_on_deactive_window.html -[test_key_event_counts.xhtml] -skip-if = toolkit != "cocoa" # Cocoa widget test -[test_keycodes.xhtml] -[test_mouse_scroll.xhtml] -skip-if = toolkit != "windows" # Windows widget test -support-files = - window_mouse_scroll_win.html - window_mouse_scroll_win_2.html -[test_native_key_bindings_mac.html] -skip-if = - toolkit != "cocoa" # Cocoa widget test - verify -[test_native_menus.xhtml] -skip-if = toolkit != "cocoa" # Cocoa widget test -support-files = native_menus_window.xhtml -[test_panel_mouse_coords.xhtml] -skip-if = toolkit == "windows" # bug 1009955 -[test_platform_colors.xhtml] -#skip-if = toolkit != "cocoa" # Cocoa widget test -skip-if = true # Bug 1207190 -[test_position_on_resize.xhtml] -skip-if = - verify && (os == 'win') - (os == "linux" && bits == 64) # Bug 1616760 -[test_secure_input.html] -support-files = file_secure_input.html -skip-if = toolkit != "cocoa" # Cocoa widget test -[test_sizemode_events.xhtml] -[test_standalone_native_menu.xhtml] -skip-if = toolkit != "cocoa" # Cocoa widget test -support-files = standalone_native_menu_window.xhtml -[test_surrogate_pair_native_key_handling.xhtml] -skip-if = toolkit != "windows" # Windows widget test -[test_system_font_changes.xhtml] -support-files = system_font_changes.xhtml -run-if = toolkit == 'gtk' # Currently the test works on only gtk3 -[test_system_status_bar.xhtml] -skip-if = toolkit != "cocoa" # Cocoa widget test -[test_taskbar_progress.xhtml] -skip-if = - toolkit != "cocoa" && toolkit != "windows" - (os == "win" && os_version == "10.0" && !ccov) # Bug 1456811 -[test_transferable_overflow.xhtml] -skip-if = (verify && (os == 'mac' || os == 'linux')) -[test_wheeltransaction.xhtml] -support-files = window_wheeltransaction.xhtml - -# Windows -# taskbar_previews.xhtml -# window_state_windows.xhtml diff --git a/widget/tests/chrome.toml b/widget/tests/chrome.toml new file mode 100644 index 000000000000..728c60c758ed --- /dev/null +++ b/widget/tests/chrome.toml @@ -0,0 +1,196 @@ +[DEFAULT] +skip-if = ["os == 'android'"] +support-files = [ + "empty_window.xhtml", + "clipboard_helper.js", +] + +["test_alwaysontop_focus.xhtml"] + +# Privacy relevant + +["test_bug1123480.xhtml"] +skip-if = ["os == 'win' && bits == 32"] + +["test_bug343416.xhtml"] +skip-if = ["debug"] + +["test_bug413277.html"] +skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test + +["test_bug428405.xhtml"] +skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test + +["test_bug429954.xhtml"] +support-files = ["window_bug429954.xhtml"] + +["test_bug444800.xhtml"] + +["test_bug466599.xhtml"] +skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test + +["test_bug478536.xhtml"] +skip-if = ["true"] # Bug 561929 +support-files = ["window_bug478536.xhtml"] + +["test_bug485118.xhtml"] +skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test + +["test_bug517396.xhtml"] +skip-if = ["(verify && (os == 'win'))"] + +["test_bug522217.xhtml"] +tags = "fullscreen" +skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +support-files = ["window_bug522217.xhtml"] + +["test_bug538242.xhtml"] +support-files = ["window_bug538242.xhtml"] + +["test_bug565392.html"] +skip-if = ["toolkit != 'windows'"] + +["test_bug586713.xhtml"] +skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +support-files = ["bug586713_window.xhtml"] + +["test_bug593307.xhtml"] +support-files = [ + "window_bug593307_offscreen.xhtml", + "window_bug593307_centerscreen.xhtml", +] + +["test_bug596600.xhtml"] +support-files = "file_bug596600.html" +skip-if = [ + "toolkit != 'cocoa'", # Cocoa widget test +] + +["test_bug673301.xhtml"] +skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test + +["test_bug760802.xhtml"] + +["test_clipboard.xhtml"] + +["test_clipboard_asyncSetData.xhtml"] + +["test_clipboard_cache.xhtml"] + +["test_clipboard_owner.xhtml"] + +["test_composition_text_querycontent.xhtml"] +support-files = ["window_composition_text_querycontent.xhtml"] + +["test_ime_state_in_contenteditable_on_readonly_change_in_parent.html"] +support-files = [ + "file_ime_state_test_helper.js", + "file_test_ime_state_in_contenteditable_on_readonly_change.js", +] + +["test_ime_state_in_plugin_in_parent.html"] +support-files = ["file_ime_state_test_helper.js"] + +["test_ime_state_in_text_control_on_reframe_in_parent.html"] +support-files = [ + "file_ime_state_test_helper.js", + "file_test_ime_state_in_text_control_on_reframe.js", +] + +["test_ime_state_on_editable_state_change_in_parent.html"] +support-files = ["file_ime_state_test_helper.js"] + +["test_ime_state_on_focus_move_in_parent.html"] +support-files = [ + "file_ime_state_test_helper.js", + "file_test_ime_state_on_focus_move.js", +] + +["test_ime_state_on_input_type_change_in_parent.html"] +skip-if = ["true"] # Bug 1817704 +support-files = [ + "file_ime_state_test_helper.js", + "file_test_ime_state_on_input_type_change.js", +] + +["test_ime_state_on_readonly_change_in_parent.html"] +support-files = [ + "file_ime_state_test_helper.js", + "file_test_ime_state_on_readonly_change.js", +] + +["test_ime_state_others_in_parent.html"] +support-files = ["window_imestate_iframes.html"] + +["test_input_events_on_deactive_window.xhtml"] +support-files = ["file_input_events_on_deactive_window.html"] + +["test_key_event_counts.xhtml"] +skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test + +["test_keycodes.xhtml"] + +["test_mouse_scroll.xhtml"] +skip-if = ["toolkit != 'windows'"] # Windows widget test +support-files = [ + "window_mouse_scroll_win.html", + "window_mouse_scroll_win_2.html", +] + +["test_native_key_bindings_mac.html"] +skip-if = [ + "toolkit != 'cocoa'", # Cocoa widget test + "verify", +] + +["test_native_menus.xhtml"] +skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +support-files = ["native_menus_window.xhtml"] + +["test_panel_mouse_coords.xhtml"] +skip-if = ["toolkit == 'windows'"] # bug 1009955 + +["test_platform_colors.xhtml"] +skip-if = ["true"] # Bug 1207190 + +["test_position_on_resize.xhtml"] +skip-if = [ + "verify && (os == 'win')", + "(os == 'linux' && bits == 64)", # Bug 1616760 +] + +["test_secure_input.html"] +support-files = ["file_secure_input.html"] +skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test + +["test_sizemode_events.xhtml"] + +["test_standalone_native_menu.xhtml"] +skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +support-files = ["standalone_native_menu_window.xhtml"] + +["test_surrogate_pair_native_key_handling.xhtml"] +skip-if = ["toolkit != 'windows'"] # Windows widget test + +["test_system_font_changes.xhtml"] +support-files = ["system_font_changes.xhtml"] +run-if = ["toolkit == 'gtk'"] # Currently the test works on only gtk3 + +["test_system_status_bar.xhtml"] +skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test + +["test_taskbar_progress.xhtml"] +skip-if = [ + "toolkit != 'cocoa' && toolkit != 'windows'", + "(os == 'win' && os_version == '10.0' && !ccov)", # Bug 1456811 +] + +["test_transferable_overflow.xhtml"] +skip-if = ["(verify && (os == 'mac' || os == 'linux'))"] + +["test_wheeltransaction.xhtml"] +support-files = ["window_wheeltransaction.xhtml"] + +# Windows +# taskbar_previews.xhtml +# window_state_windows.xhtml diff --git a/widget/tests/moz.build b/widget/tests/moz.build index b50a2949f7bd..35df4ff83871 100644 --- a/widget/tests/moz.build +++ b/widget/tests/moz.build @@ -115,7 +115,7 @@ with Files("*wheeltransaction*"): XPCSHELL_TESTS_MANIFESTS += ["unit/xpcshell.ini"] MOCHITEST_MANIFESTS += ["mochitest.ini"] -MOCHITEST_CHROME_MANIFESTS += ["chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["chrome.toml"] BROWSER_CHROME_MANIFESTS += ["browser/browser.ini"] # if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': diff --git a/xpfe/appshell/moz.build b/xpfe/appshell/moz.build index f32c647fb1d2..53b0807d1d28 100644 --- a/xpfe/appshell/moz.build +++ b/xpfe/appshell/moz.build @@ -7,7 +7,7 @@ with Files("**"): BUG_COMPONENT = ("Core", "Window Management") -MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] +MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"] XPIDL_SOURCES += [ "nsIAppShellService.idl", diff --git a/xpfe/appshell/test/chrome.ini b/xpfe/appshell/test/chrome.ini deleted file mode 100644 index ac756b6fae6a..000000000000 --- a/xpfe/appshell/test/chrome.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' - -[test_windowlessBrowser.xhtml] diff --git a/xpfe/appshell/test/chrome.toml b/xpfe/appshell/test/chrome.toml new file mode 100644 index 000000000000..aba2e1e99a15 --- /dev/null +++ b/xpfe/appshell/test/chrome.toml @@ -0,0 +1,4 @@ +[DEFAULT] +skip-if = ["os == 'android'"] + +["test_windowlessBrowser.xhtml"]