From 2cae29b76ea84481899fa907ecd4607d49b25b74 Mon Sep 17 00:00:00 2001 From: Joel Maher Date: Tue, 21 Nov 2023 17:35:23 +0000 Subject: [PATCH] Bug 1859869 - batch 12 - browser/* xpcshell .ini manifests to .toml. r=aryx,extension-reviewers,credential-management-reviewers,search-reviewers,sessionstore-reviewers,places-reviewers,issammani,Standard8,robwu,sclements Differential Revision: https://phabricator.services.mozilla.com/D193996 --- browser/components/about/moz.build | 2 +- .../components/about/test/unit/xpcshell.ini | 7 - .../components/about/test/unit/xpcshell.toml | 7 + browser/components/aboutlogins/moz.build | 2 +- .../aboutlogins/tests/unit/xpcshell.ini | 7 - .../aboutlogins/tests/unit/xpcshell.toml | 7 + browser/components/attribution/moz.build | 2 +- .../attribution/test/xpcshell/xpcshell.ini | 11 - .../attribution/test/xpcshell/xpcshell.toml | 15 ++ browser/components/customizableui/moz.build | 2 +- .../customizableui/test/unit/xpcshell.ini | 6 - .../customizableui/test/unit/xpcshell.toml | 6 + browser/components/doh/moz.build | 2 +- browser/components/doh/test/unit/xpcshell.ini | 12 -- .../components/doh/test/unit/xpcshell.toml | 14 ++ browser/components/downloads/moz.build | 2 +- .../downloads/test/unit/xpcshell.ini | 9 - .../downloads/test/unit/xpcshell.toml | 12 ++ .../enterprisepolicies/tests/moz.build | 2 +- .../tests/xpcshell/xpcshell.ini | 33 --- .../tests/xpcshell/xpcshell.toml | 55 +++++ browser/components/extensions/moz.build | 2 +- .../extensions/test/xpcshell/xpcshell.ini | 48 ----- .../extensions/test/xpcshell/xpcshell.toml | 75 +++++++ browser/components/installerprefs/moz.build | 2 +- .../installerprefs/test/unit/xpcshell.ini | 20 -- .../installerprefs/test/unit/xpcshell.toml | 25 +++ browser/components/migration/moz.build | 2 +- .../migration/tests/unit/xpcshell.ini | 61 ------ .../migration/tests/unit/xpcshell.toml | 89 ++++++++ browser/components/moz.build | 2 +- browser/components/newtab/moz.build | 2 +- .../newtab/test/xpcshell/xpcshell.ini | 32 --- .../newtab/test/xpcshell/xpcshell.toml | 44 ++++ browser/components/pagedata/moz.build | 2 +- .../pagedata/tests/unit/xpcshell.ini | 14 -- .../pagedata/tests/unit/xpcshell.toml | 19 ++ browser/components/places/moz.build | 2 +- .../components/places/tests/unit/xpcshell.ini | 24 --- .../places/tests/unit/xpcshell.toml | 38 ++++ browser/components/search/moz.build | 2 +- .../components/search/test/unit/xpcshell.ini | 20 -- .../components/search/test/unit/xpcshell.toml | 25 +++ browser/components/sessionstore/moz.build | 2 +- .../sessionstore/test/unit/xpcshell.ini | 21 -- .../sessionstore/test/unit/xpcshell.toml | 28 +++ browser/components/shell/moz.build | 2 +- .../components/shell/test/unit/xpcshell.ini | 6 - .../components/shell/test/unit/xpcshell.toml | 6 + browser/components/syncedtabs/moz.build | 2 +- .../syncedtabs/test/xpcshell/xpcshell.ini | 10 - .../syncedtabs/test/xpcshell/xpcshell.toml | 14 ++ browser/components/tests/unit/xpcshell.ini | 16 -- browser/components/tests/unit/xpcshell.toml | 22 ++ browser/components/urlbar/moz.build | 4 +- .../tests/quicksuggest/unit/xpcshell.ini | 26 --- .../tests/quicksuggest/unit/xpcshell.toml | 46 +++++ .../components/urlbar/tests/unit/xpcshell.ini | 106 ---------- .../urlbar/tests/unit/xpcshell.toml | 195 ++++++++++++++++++ browser/extensions/formautofill/moz.build | 2 +- .../formautofill/test/unit/xpcshell.ini | 101 --------- .../formautofill/test/unit/xpcshell.toml | 155 ++++++++++++++ browser/modules/moz.build | 2 +- browser/modules/test/unit/xpcshell.ini | 23 --- browser/modules/test/unit/xpcshell.toml | 36 ++++ browser/tools/mozscreenshots/moz.build | 2 +- .../tests/xpcshell/xpcshell.ini | 5 - .../tests/xpcshell/xpcshell.toml | 5 + 68 files changed, 961 insertions(+), 641 deletions(-) delete mode 100644 browser/components/about/test/unit/xpcshell.ini create mode 100644 browser/components/about/test/unit/xpcshell.toml delete mode 100644 browser/components/aboutlogins/tests/unit/xpcshell.ini create mode 100644 browser/components/aboutlogins/tests/unit/xpcshell.toml delete mode 100644 browser/components/attribution/test/xpcshell/xpcshell.ini create mode 100644 browser/components/attribution/test/xpcshell/xpcshell.toml delete mode 100644 browser/components/customizableui/test/unit/xpcshell.ini create mode 100644 browser/components/customizableui/test/unit/xpcshell.toml delete mode 100644 browser/components/doh/test/unit/xpcshell.ini create mode 100644 browser/components/doh/test/unit/xpcshell.toml delete mode 100644 browser/components/downloads/test/unit/xpcshell.ini create mode 100644 browser/components/downloads/test/unit/xpcshell.toml delete mode 100644 browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini create mode 100644 browser/components/enterprisepolicies/tests/xpcshell/xpcshell.toml delete mode 100644 browser/components/extensions/test/xpcshell/xpcshell.ini create mode 100644 browser/components/extensions/test/xpcshell/xpcshell.toml delete mode 100644 browser/components/installerprefs/test/unit/xpcshell.ini create mode 100644 browser/components/installerprefs/test/unit/xpcshell.toml delete mode 100644 browser/components/migration/tests/unit/xpcshell.ini create mode 100644 browser/components/migration/tests/unit/xpcshell.toml delete mode 100644 browser/components/newtab/test/xpcshell/xpcshell.ini create mode 100644 browser/components/newtab/test/xpcshell/xpcshell.toml delete mode 100644 browser/components/pagedata/tests/unit/xpcshell.ini create mode 100644 browser/components/pagedata/tests/unit/xpcshell.toml delete mode 100644 browser/components/places/tests/unit/xpcshell.ini create mode 100644 browser/components/places/tests/unit/xpcshell.toml delete mode 100644 browser/components/search/test/unit/xpcshell.ini create mode 100644 browser/components/search/test/unit/xpcshell.toml delete mode 100644 browser/components/sessionstore/test/unit/xpcshell.ini create mode 100644 browser/components/sessionstore/test/unit/xpcshell.toml delete mode 100644 browser/components/shell/test/unit/xpcshell.ini create mode 100644 browser/components/shell/test/unit/xpcshell.toml delete mode 100644 browser/components/syncedtabs/test/xpcshell/xpcshell.ini create mode 100644 browser/components/syncedtabs/test/xpcshell/xpcshell.toml delete mode 100644 browser/components/tests/unit/xpcshell.ini create mode 100644 browser/components/tests/unit/xpcshell.toml delete mode 100644 browser/components/urlbar/tests/quicksuggest/unit/xpcshell.ini create mode 100644 browser/components/urlbar/tests/quicksuggest/unit/xpcshell.toml delete mode 100644 browser/components/urlbar/tests/unit/xpcshell.ini create mode 100644 browser/components/urlbar/tests/unit/xpcshell.toml delete mode 100644 browser/extensions/formautofill/test/unit/xpcshell.ini create mode 100644 browser/extensions/formautofill/test/unit/xpcshell.toml delete mode 100644 browser/modules/test/unit/xpcshell.ini create mode 100644 browser/modules/test/unit/xpcshell.toml delete mode 100644 browser/tools/mozscreenshots/tests/xpcshell/xpcshell.ini create mode 100644 browser/tools/mozscreenshots/tests/xpcshell/xpcshell.toml diff --git a/browser/components/about/moz.build b/browser/components/about/moz.build index 9be34f57b927..994f084510a8 100644 --- a/browser/components/about/moz.build +++ b/browser/components/about/moz.build @@ -11,7 +11,7 @@ EXPORTS.mozilla.browser += [ "AboutRedirector.h", ] -XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"] SOURCES += [ "AboutRedirector.cpp", diff --git a/browser/components/about/test/unit/xpcshell.ini b/browser/components/about/test/unit/xpcshell.ini deleted file mode 100644 index a509dbfc4eed..000000000000 --- a/browser/components/about/test/unit/xpcshell.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -skip-if = toolkit == 'android' # bug 1730213 -head = -# make the firefox services (eg newtab-service) available to xpcshell -firefox-appdir = browser - -[test_getURIFlags.js] diff --git a/browser/components/about/test/unit/xpcshell.toml b/browser/components/about/test/unit/xpcshell.toml new file mode 100644 index 000000000000..74383ed61ae6 --- /dev/null +++ b/browser/components/about/test/unit/xpcshell.toml @@ -0,0 +1,7 @@ +[DEFAULT] +skip-if = ["toolkit == 'android'"] # bug 1730213 +head = '' # no value from INI +# make the firefox services (eg newtab-service) available to xpcshell +firefox-appdir = "browser" + +["test_getURIFlags.js"] diff --git a/browser/components/aboutlogins/moz.build b/browser/components/aboutlogins/moz.build index 8870250f4009..b0ac44a41cae 100644 --- a/browser/components/aboutlogins/moz.build +++ b/browser/components/aboutlogins/moz.build @@ -20,4 +20,4 @@ FINAL_TARGET_FILES.actors += [ BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.toml"] MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] -XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.toml"] diff --git a/browser/components/aboutlogins/tests/unit/xpcshell.ini b/browser/components/aboutlogins/tests/unit/xpcshell.ini deleted file mode 100644 index e827d6d688f9..000000000000 --- a/browser/components/aboutlogins/tests/unit/xpcshell.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -skip-if = toolkit == 'android' # bug 1730213 -head = head.js -firefox-appdir = browser - -[test_getPotentialBreachesByLoginGUID.js] -tags = remote-settings diff --git a/browser/components/aboutlogins/tests/unit/xpcshell.toml b/browser/components/aboutlogins/tests/unit/xpcshell.toml new file mode 100644 index 000000000000..d89279d0717f --- /dev/null +++ b/browser/components/aboutlogins/tests/unit/xpcshell.toml @@ -0,0 +1,7 @@ +[DEFAULT] +skip-if = ["toolkit == 'android'"] # bug 1730213 +head = "head.js" +firefox-appdir = "browser" + +["test_getPotentialBreachesByLoginGUID.js"] +tags = "remote-settings" diff --git a/browser/components/attribution/moz.build b/browser/components/attribution/moz.build index a212ee4cee75..7bb14300f83f 100644 --- a/browser/components/attribution/moz.build +++ b/browser/components/attribution/moz.build @@ -7,7 +7,7 @@ with Files("**"): BUG_COMPONENT = ("Toolkit", "Telemetry") -XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.toml"] BROWSER_CHROME_MANIFESTS += ["test/browser/browser.toml"] diff --git a/browser/components/attribution/test/xpcshell/xpcshell.ini b/browser/components/attribution/test/xpcshell/xpcshell.ini deleted file mode 100644 index bc50877787d7..000000000000 --- a/browser/components/attribution/test/xpcshell/xpcshell.ini +++ /dev/null @@ -1,11 +0,0 @@ -[DEFAULT] -firefox-appdir = browser -skip-if = (os != "win" && toolkit != "cocoa") # Only available on Windows and macOS -head = head.js -prefs = - browser.attribution.macos.enabled=true - -[test_AttributionCode.js] -[test_MacAttribution.js] -skip-if = toolkit != "cocoa" # osx specific tests -[test_attribution_parsing.js] diff --git a/browser/components/attribution/test/xpcshell/xpcshell.toml b/browser/components/attribution/test/xpcshell/xpcshell.toml new file mode 100644 index 000000000000..b685e0c55fae --- /dev/null +++ b/browser/components/attribution/test/xpcshell/xpcshell.toml @@ -0,0 +1,15 @@ +[DEFAULT] +firefox-appdir = "browser" +run-if = [ + "os == 'win'", + "os == 'mac'", +] +head = "head.js" +prefs = ["browser.attribution.macos.enabled=true"] + +["test_AttributionCode.js"] + +["test_MacAttribution.js"] +run-if = ["os == 'mac'"] # osx specific tests + +["test_attribution_parsing.js"] diff --git a/browser/components/customizableui/moz.build b/browser/components/customizableui/moz.build index f21de8e99af2..5d1e0e4061e5 100644 --- a/browser/components/customizableui/moz.build +++ b/browser/components/customizableui/moz.build @@ -9,7 +9,7 @@ DIRS += [ ] BROWSER_CHROME_MANIFESTS += ["test/browser.toml"] -XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"] TESTING_JS_MODULES += [ "test/CustomizableUITestUtils.sys.mjs", diff --git a/browser/components/customizableui/test/unit/xpcshell.ini b/browser/components/customizableui/test/unit/xpcshell.ini deleted file mode 100644 index ec1429580571..000000000000 --- a/browser/components/customizableui/test/unit/xpcshell.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -head = -skip-if = toolkit == 'android' # bug 1730213 -firefox-appdir = browser - -[test_unified_extensions_migration.js] diff --git a/browser/components/customizableui/test/unit/xpcshell.toml b/browser/components/customizableui/test/unit/xpcshell.toml new file mode 100644 index 000000000000..b8665fb3ef28 --- /dev/null +++ b/browser/components/customizableui/test/unit/xpcshell.toml @@ -0,0 +1,6 @@ +[DEFAULT] +head = '' # no value from INI +skip-if = ["toolkit == 'android'"] # bug 1730213 +firefox-appdir = "browser" + +["test_unified_extensions_migration.js"] diff --git a/browser/components/doh/moz.build b/browser/components/doh/moz.build index fafcf5b9ba4a..05030b09ab76 100644 --- a/browser/components/doh/moz.build +++ b/browser/components/doh/moz.build @@ -18,5 +18,5 @@ TESTING_JS_MODULES += [ "DoHTestUtils.sys.mjs", ] -XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"] BROWSER_CHROME_MANIFESTS += ["test/browser/browser.toml"] diff --git a/browser/components/doh/test/unit/xpcshell.ini b/browser/components/doh/test/unit/xpcshell.ini deleted file mode 100644 index 7b3d7e31cf4d..000000000000 --- a/browser/components/doh/test/unit/xpcshell.ini +++ /dev/null @@ -1,12 +0,0 @@ -[DEFAULT] -skip-if = toolkit == 'android' # bug 1730213 -head = head.js -firefox-appdir = browser -support-files = - ../../../../../netwerk/test/unit/http2-ca.pem - -[test_heuristics.js] -[test_DNSLookup.js] -skip-if = debug # Bug 1617845 -[test_LookupAggregator.js] -[test_TRRRacer.js] diff --git a/browser/components/doh/test/unit/xpcshell.toml b/browser/components/doh/test/unit/xpcshell.toml new file mode 100644 index 000000000000..08644833d8c0 --- /dev/null +++ b/browser/components/doh/test/unit/xpcshell.toml @@ -0,0 +1,14 @@ +[DEFAULT] +skip-if = ["toolkit == 'android'"] # bug 1730213 +head = "head.js" +firefox-appdir = "browser" +support-files = ["../../../../../netwerk/test/unit/http2-ca.pem"] + +["test_DNSLookup.js"] +skip-if = ["debug"] # Bug 1617845 + +["test_LookupAggregator.js"] + +["test_TRRRacer.js"] + +["test_heuristics.js"] diff --git a/browser/components/downloads/moz.build b/browser/components/downloads/moz.build index 353635ea467a..a71810b5e6cd 100644 --- a/browser/components/downloads/moz.build +++ b/browser/components/downloads/moz.build @@ -27,4 +27,4 @@ if toolkit == "cocoa": with Files("**"): BUG_COMPONENT = ("Firefox", "Downloads Panel") -XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"] diff --git a/browser/components/downloads/test/unit/xpcshell.ini b/browser/components/downloads/test/unit/xpcshell.ini deleted file mode 100644 index 9e67834c3e3b..000000000000 --- a/browser/components/downloads/test/unit/xpcshell.ini +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -head = head.js -firefox-appdir = browser -skip-if = toolkit == 'android' # bug 1730213 - -[test_DownloadLastDir_basics.js] -[test_DownloadsCommon_getMimeInfo.js] -[test_DownloadsCommon_isFileOfType.js] -[test_DownloadsViewableInternally.js] diff --git a/browser/components/downloads/test/unit/xpcshell.toml b/browser/components/downloads/test/unit/xpcshell.toml new file mode 100644 index 000000000000..3371972c8832 --- /dev/null +++ b/browser/components/downloads/test/unit/xpcshell.toml @@ -0,0 +1,12 @@ +[DEFAULT] +head = "head.js" +firefox-appdir = "browser" +skip-if = ["toolkit == 'android'"] # bug 1730213 + +["test_DownloadLastDir_basics.js"] + +["test_DownloadsCommon_getMimeInfo.js"] + +["test_DownloadsCommon_isFileOfType.js"] + +["test_DownloadsViewableInternally.js"] diff --git a/browser/components/enterprisepolicies/tests/moz.build b/browser/components/enterprisepolicies/tests/moz.build index c1e6c19a01c9..d1f5dfe7c41b 100644 --- a/browser/components/enterprisepolicies/tests/moz.build +++ b/browser/components/enterprisepolicies/tests/moz.build @@ -17,4 +17,4 @@ BROWSER_CHROME_MANIFESTS += [ "browser/show_home_button/browser.toml", ] -XPCSHELL_TESTS_MANIFESTS += ["xpcshell/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["xpcshell/xpcshell.toml"] diff --git a/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini b/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini deleted file mode 100644 index 7902977bd669..000000000000 --- a/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini +++ /dev/null @@ -1,33 +0,0 @@ -[DEFAULT] -skip-if = toolkit == 'android' # bug 1730213 -firefox-appdir = browser -head = head.js -support-files = - policytest_v0.1.xpi - -[test_3rdparty.js] -[test_addon_update.js] -[test_appupdateurl.js] -[test_bug1658259.js] -[test_cleanup.js] -[test_clear_blocked_cookies.js] -[test_containers.js] -[test_defaultbrowsercheck.js] -[test_empty_policy.js] -[test_exempt_domain_file_type_pairs_from_file_type_download_warnings.js] -[test_extensions.js] -[test_extensionsettings.js] -[test_macosparser_unflatten.js] -skip-if = os != 'mac' -[test_permissions.js] -[test_policy_search_engine.js] -[test_popups_cookies_addons.js] -support-files = config_popups_cookies_addons.json -[test_preferences.js] -[test_proxy.js] -[test_requestedlocales.js] -[test_runOnce_helper.js] -[test_simple_pref_policies.js] -[test_sorted_alphabetically.js] -[test_telemetry.js] -[test_appupdatepin.js] diff --git a/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.toml b/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.toml new file mode 100644 index 000000000000..9bd96f3b64cf --- /dev/null +++ b/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.toml @@ -0,0 +1,55 @@ +[DEFAULT] +skip-if = ["toolkit == 'android'"] # bug 1730213 +firefox-appdir = "browser" +head = "head.js" +support-files = ["policytest_v0.1.xpi"] + +["test_3rdparty.js"] + +["test_addon_update.js"] + +["test_appupdatepin.js"] + +["test_appupdateurl.js"] + +["test_bug1658259.js"] + +["test_cleanup.js"] + +["test_clear_blocked_cookies.js"] + +["test_containers.js"] + +["test_defaultbrowsercheck.js"] + +["test_empty_policy.js"] + +["test_exempt_domain_file_type_pairs_from_file_type_download_warnings.js"] + +["test_extensions.js"] + +["test_extensionsettings.js"] + +["test_macosparser_unflatten.js"] +run-if = ["os == 'mac'"] + +["test_permissions.js"] + +["test_policy_search_engine.js"] + +["test_popups_cookies_addons.js"] +support-files = ["config_popups_cookies_addons.json"] + +["test_preferences.js"] + +["test_proxy.js"] + +["test_requestedlocales.js"] + +["test_runOnce_helper.js"] + +["test_simple_pref_policies.js"] + +["test_sorted_alphabetically.js"] + +["test_telemetry.js"] diff --git a/browser/components/extensions/moz.build b/browser/components/extensions/moz.build index 7fdbde6276fb..59a242cb1054 100644 --- a/browser/components/extensions/moz.build +++ b/browser/components/extensions/moz.build @@ -33,5 +33,5 @@ BROWSER_CHROME_MANIFESTS += [ MOCHITEST_MANIFESTS += ["test/mochitest/mochitest.toml"] XPCSHELL_TESTS_MANIFESTS += [ - "test/xpcshell/xpcshell.ini", + "test/xpcshell/xpcshell.toml", ] diff --git a/browser/components/extensions/test/xpcshell/xpcshell.ini b/browser/components/extensions/test/xpcshell/xpcshell.ini deleted file mode 100644 index 29e351cb7a58..000000000000 --- a/browser/components/extensions/test/xpcshell/xpcshell.ini +++ /dev/null @@ -1,48 +0,0 @@ -[DEFAULT] -skip-if = toolkit == 'android' # bug 1730213 -head = head.js -firefox-appdir = browser -tags = webextensions condprof -dupe-manifest = - -[test_ext_bookmarks.js] -skip-if = condprof # Bug 1769184 - by design for now -[test_ext_browsingData_downloads.js] -[test_ext_browsingData_passwords.js] -skip-if = - tsan # Times out, bug 1612707 -[test_ext_browsingData_settings.js] -[test_ext_chrome_settings_overrides_home.js] -[test_ext_chrome_settings_overrides_update.js] -[test_ext_distribution_popup.js] -[test_ext_history.js] -[test_ext_homepage_overrides_private.js] -[test_ext_manifest.js] -[test_ext_manifest_commands.js] -run-sequentially = very high failure rate in parallel -[test_ext_manifest_omnibox.js] -[test_ext_manifest_permissions.js] -[test_ext_menu_caller.js] -[test_ext_menu_startup.js] -[test_ext_normandyAddonStudy.js] -[test_ext_pageAction_shutdown.js] -[test_ext_pkcs11_management.js] -[test_ext_settings_overrides_defaults.js] -skip-if = condprof # Bug 1776135 - by design, modifies search settings at start of test -support-files = - data/test/manifest.json - data/test2/manifest.json -[test_ext_settings_overrides_search.js] -[test_ext_settings_overrides_search_mozParam.js] -skip-if = condprof # Bug 1776652 -support-files = - data/test/manifest.json -[test_ext_settings_overrides_shutdown.js] -[test_ext_settings_validate.js] -[test_ext_topSites.js] -skip-if = condprof # Bug 1769184 - by design for now -[test_ext_url_overrides_newtab.js] -[test_ext_url_overrides_newtab_update.js] -[test_ext_urlbar.js] -skip-if = tsan # Unreasonably slow, bug 1612707 - condprof # Bug 1769184 - by design for now diff --git a/browser/components/extensions/test/xpcshell/xpcshell.toml b/browser/components/extensions/test/xpcshell/xpcshell.toml new file mode 100644 index 000000000000..4ab6e75172c3 --- /dev/null +++ b/browser/components/extensions/test/xpcshell/xpcshell.toml @@ -0,0 +1,75 @@ +[DEFAULT] +skip-if = ["os == 'android'"] # bug 1730213 +head = "head.js" +firefox-appdir = "browser" +tags = "webextensions condprof" +dupe-manifest = "" + +["test_ext_bookmarks.js"] +skip-if = ["condprof"] # Bug 1769184 - by design for now + +["test_ext_browsingData_downloads.js"] + +["test_ext_browsingData_passwords.js"] +skip-if = ["tsan"] # Times out, bug 1612707 + +["test_ext_browsingData_settings.js"] + +["test_ext_chrome_settings_overrides_home.js"] + +["test_ext_chrome_settings_overrides_update.js"] + +["test_ext_distribution_popup.js"] + +["test_ext_history.js"] + +["test_ext_homepage_overrides_private.js"] + +["test_ext_manifest.js"] + +["test_ext_manifest_commands.js"] +run-sequentially = "very high failure rate in parallel" + +["test_ext_manifest_omnibox.js"] + +["test_ext_manifest_permissions.js"] + +["test_ext_menu_caller.js"] + +["test_ext_menu_startup.js"] + +["test_ext_normandyAddonStudy.js"] + +["test_ext_pageAction_shutdown.js"] + +["test_ext_pkcs11_management.js"] + +["test_ext_settings_overrides_defaults.js"] +skip-if = ["condprof"] # Bug 1776135 - by design, modifies search settings at start of test +support-files = [ + "data/test/manifest.json", + "data/test2/manifest.json", +] + +["test_ext_settings_overrides_search.js"] + +["test_ext_settings_overrides_search_mozParam.js"] +skip-if = ["condprof"] # Bug 1776652 +support-files = ["data/test/manifest.json"] + +["test_ext_settings_overrides_shutdown.js"] + +["test_ext_settings_validate.js"] + +["test_ext_topSites.js"] +skip-if = ["condprof"] # Bug 1769184 - by design for now + +["test_ext_url_overrides_newtab.js"] + +["test_ext_url_overrides_newtab_update.js"] + +["test_ext_urlbar.js"] +skip-if = [ + "tsan", # Unreasonably slow, bug 1612707 + "condprof", # Bug 1769184 - by design for now +] diff --git a/browser/components/installerprefs/moz.build b/browser/components/installerprefs/moz.build index a93c41fdeaa5..bfe931196a77 100644 --- a/browser/components/installerprefs/moz.build +++ b/browser/components/installerprefs/moz.build @@ -7,7 +7,7 @@ with Files("**"): BUG_COMPONENT = ("Firefox", "Installer") -XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"] EXTRA_JS_MODULES += [ "InstallerPrefs.sys.mjs", diff --git a/browser/components/installerprefs/test/unit/xpcshell.ini b/browser/components/installerprefs/test/unit/xpcshell.ini deleted file mode 100644 index f0ee7e3ceaf3..000000000000 --- a/browser/components/installerprefs/test/unit/xpcshell.ini +++ /dev/null @@ -1,20 +0,0 @@ -[DEFAULT] -head = head.js -firefox-appdir = browser -skip-if = os != 'win' - -# These tests must all run sequentially because they use the same registry key. -# It might be possible to get around this requirement by overriding the install -# hash so each test uses a different key, and if a lot more tests are added here -# then it would be worth looking into that. -[test_empty_prefs_list.js] -run-sequentially = Uses the Windows registry -skip-if = os == 'win' && msix # https://bugzilla.mozilla.org/show_bug.cgi?id=1807932 -[test_invalid_name.js] -run-sequentially = Uses the Windows registry -[test_nonbool_pref.js] -run-sequentially = Uses the Windows registry -[test_pref_change.js] -run-sequentially = Uses the Windows registry -[test_pref_values.js] -run-sequentially = Uses the Windows registry diff --git a/browser/components/installerprefs/test/unit/xpcshell.toml b/browser/components/installerprefs/test/unit/xpcshell.toml new file mode 100644 index 000000000000..5837507001e6 --- /dev/null +++ b/browser/components/installerprefs/test/unit/xpcshell.toml @@ -0,0 +1,25 @@ +[DEFAULT] +head = "head.js" +firefox-appdir = "browser" +skip-if = ["os != 'win'"] + +# These tests must all run sequentially because they use the same registry key. +# It might be possible to get around this requirement by overriding the install +# hash so each test uses a different key, and if a lot more tests are added here +# then it would be worth looking into that. + +["test_empty_prefs_list.js"] +run-sequentially = "Uses the Windows registry" +skip-if = ["os == 'win' && msix"] # https://bugzilla.mozilla.org/show_bug.cgi?id=1807932 + +["test_invalid_name.js"] +run-sequentially = "Uses the Windows registry" + +["test_nonbool_pref.js"] +run-sequentially = "Uses the Windows registry" + +["test_pref_change.js"] +run-sequentially = "Uses the Windows registry" + +["test_pref_values.js"] +run-sequentially = "Uses the Windows registry" diff --git a/browser/components/migration/moz.build b/browser/components/migration/moz.build index 3471a1d92c6c..ed6f354e0102 100644 --- a/browser/components/migration/moz.build +++ b/browser/components/migration/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/. -XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.toml"] MARIONETTE_UNIT_MANIFESTS += ["tests/marionette/manifest.ini"] diff --git a/browser/components/migration/tests/unit/xpcshell.ini b/browser/components/migration/tests/unit/xpcshell.ini deleted file mode 100644 index 68075b049dfe..000000000000 --- a/browser/components/migration/tests/unit/xpcshell.ini +++ /dev/null @@ -1,61 +0,0 @@ -[DEFAULT] -head = head_migration.js -tags = condprof -firefox-appdir = browser -skip-if = toolkit == 'android' # bug 1730213 -prefs = - browser.migrate.showBookmarksToolbarAfterMigration=true -support-files = - Library/** - AppData/** - bookmarks.exported.html - bookmarks.exported.json - bookmarks.invalid.html - -[test_360se_bookmarks.js] -skip-if = os != "win" -[test_360seMigrationUtils.js] -run-if = os == "win" -[test_BookmarksFileMigrator.js] -[test_ChromeMigrationUtils_path_chromium_snap.js] -run-if = os == "linux" -[test_Chrome_bookmarks.js] -[test_Chrome_corrupt_history.js] -[test_Chrome_credit_cards.js] -skip-if = os != "win" && os != "mac" - condprof # bug 1769154 - not realistic for condprof -[test_Chrome_extensions.js] -[test_Chrome_formdata.js] -[test_Chrome_history.js] -skip-if = os != "mac" # Relies on ULibDir -[test_Chrome_passwords.js] -skip-if = os != "win" && os != "mac" - condprof # bug 1769154 - not realistic for condprof -[test_Chrome_passwords_emptySource.js] -skip-if = os != "win" && os != "mac" - condprof # bug 1769154 - not realistic for condprof -support-files = - LibraryWithNoData/** -[test_ChromeMigrationUtils.js] -[test_ChromeMigrationUtils_path.js] -[test_Chrome_permissions.js] -[test_Edge_db_migration.js] -skip-if = os != "win" -[test_Edge_registry_migration.js] -skip-if = os != "win" -[test_PasswordFileMigrator.js] -[test_fx_telemetry.js] -[test_IE_bookmarks.js] -skip-if = !(os == "win" && bits == 64) # bug 1392396 -[test_IE_history.js] -skip-if = - os != "win" - os == "win" && msix # https://bugzilla.mozilla.org/show_bug.cgi?id=1807928 -[test_MigrationUtils_timedRetry.js] -skip-if = !debug && os == "mac" #Bug 1558330 -[test_Safari_bookmarks.js] -skip-if = os != "mac" -[test_Safari_history.js] -skip-if = os != "mac" -[test_Safari_permissions.js] -skip-if = os != "mac" diff --git a/browser/components/migration/tests/unit/xpcshell.toml b/browser/components/migration/tests/unit/xpcshell.toml new file mode 100644 index 000000000000..545381751f1c --- /dev/null +++ b/browser/components/migration/tests/unit/xpcshell.toml @@ -0,0 +1,89 @@ +[DEFAULT] +head = "head_migration.js" +tags = "condprof" +firefox-appdir = "browser" +skip-if = ["toolkit == 'android'"] # bug 1730213 +prefs = ["browser.migrate.showBookmarksToolbarAfterMigration=true"] +support-files = [ + "Library/**", + "AppData/**", + "bookmarks.exported.html", + "bookmarks.exported.json", + "bookmarks.invalid.html", +] + +["test_360seMigrationUtils.js"] +run-if = ["os == 'win'"] + +["test_360se_bookmarks.js"] +run-if = ["os == 'win'"] + +["test_BookmarksFileMigrator.js"] + +["test_ChromeMigrationUtils.js"] + +["test_ChromeMigrationUtils_path.js"] + +["test_ChromeMigrationUtils_path_chromium_snap.js"] +run-if = ["os == 'linux'"] + +["test_Chrome_bookmarks.js"] + +["test_Chrome_corrupt_history.js"] + +["test_Chrome_credit_cards.js"] +skip-if = [ + "os != 'win' && os != 'mac'", + "condprof", # bug 1769154 - not realistic for condprof +] + +["test_Chrome_extensions.js"] + +["test_Chrome_formdata.js"] + +["test_Chrome_history.js"] +skip-if = ["os != 'mac'"] # Relies on ULibDir + +["test_Chrome_passwords.js"] +skip-if = [ + "os != 'win' && os != 'mac'", + "condprof", # bug 1769154 - not realistic for condprof +] + +["test_Chrome_passwords_emptySource.js"] +skip-if = [ + "os != 'win' && os != 'mac'", + "condprof", # bug 1769154 - not realistic for condprof +] +support-files = ["LibraryWithNoData/**"] + +["test_Chrome_permissions.js"] + +["test_Edge_db_migration.js"] +run-if = ["os == 'win'"] + +["test_Edge_registry_migration.js"] +run-if = ["os == 'win'"] + +["test_IE_bookmarks.js"] +run-if = ["os == 'win' && bits == 64"] # bug 1392396 + +["test_IE_history.js"] +run-if = ["os == 'win'"] +skip-if = ["os == 'win' && msix"] # https://bugzilla.mozilla.org/show_bug.cgi?id=1807928 + +["test_MigrationUtils_timedRetry.js"] +skip-if = ["os == 'mac' && !debug"] #Bug 1558330 + +["test_PasswordFileMigrator.js"] + +["test_Safari_bookmarks.js"] +run-if = ["os == 'mac'"] + +["test_Safari_history.js"] +run-if = ["os == 'mac'"] + +["test_Safari_permissions.js"] +run-if = ["os == 'mac'"] + +["test_fx_telemetry.js"] diff --git a/browser/components/moz.build b/browser/components/moz.build index 04916973508c..ef281406721f 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -109,4 +109,4 @@ if CONFIG["MOZ_UPDATER"]: "tests/browser/whats_new_page/browser.toml", ] -XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.toml"] diff --git a/browser/components/newtab/moz.build b/browser/components/newtab/moz.build index 10523800fee3..039f3a64bb1e 100644 --- a/browser/components/newtab/moz.build +++ b/browser/components/newtab/moz.build @@ -32,7 +32,7 @@ SPHINX_TREES["docs"] = "docs" SPHINX_TREES["content-src/asrouter/docs"] = "content-src/asrouter/docs" XPCSHELL_TESTS_MANIFESTS += [ - "test/xpcshell/xpcshell.ini", + "test/xpcshell/xpcshell.toml", ] XPIDL_SOURCES += [ diff --git a/browser/components/newtab/test/xpcshell/xpcshell.ini b/browser/components/newtab/test/xpcshell/xpcshell.ini deleted file mode 100644 index 93c5f1ffcb3e..000000000000 --- a/browser/components/newtab/test/xpcshell/xpcshell.ini +++ /dev/null @@ -1,32 +0,0 @@ -[DEFAULT] -head = head.js -firefox-appdir = browser -skip-if = toolkit == 'android' # bug 1730213 -prefs = - browser.startup.homepage.abouthome_cache.enabled=true - browser.startup.homepage.abouthome_cache.testing=true - browser.attribution.macos.enabled=true - -[test_AboutHomeStartupCacheChild.js] -[test_AboutHomeStartupCacheWorker.js] -support-files = - topstories.json -skip-if = - socketprocess_networking # Bug 1759035 - -[test_AboutNewTab.js] -[test_AboutWelcomeAttribution.js] -[test_ASRouterTargeting_attribution.js] -skip-if = - toolkit != "cocoa" # osx specific tests -[test_ASRouter_getTargetingParameters.js] -[test_ASRouterTargeting_snapshot.js] -[test_AboutWelcomeTelemetry.js] -[test_CFRMessageProvider.js] -[test_InflightAssetsMessageProvider.js] -[test_NimbusRolloutMessageProvider.js] -[test_OnboardingMessageProvider.js] -[test_PanelTestProvider.js] -[test_reach_experiments.js] -[test_remoteExperiments.js] -[test_AboutWelcomeTelemetry_glean.js] diff --git a/browser/components/newtab/test/xpcshell/xpcshell.toml b/browser/components/newtab/test/xpcshell/xpcshell.toml new file mode 100644 index 000000000000..f541d30a26a2 --- /dev/null +++ b/browser/components/newtab/test/xpcshell/xpcshell.toml @@ -0,0 +1,44 @@ +[DEFAULT] +head = "head.js" +firefox-appdir = "browser" +skip-if = ["toolkit == 'android'"] # bug 1730213 +prefs = [ + "browser.startup.homepage.abouthome_cache.enabled=true", + "browser.startup.homepage.abouthome_cache.testing=true", + "browser.attribution.macos.enabled=true", +] + +["test_ASRouterTargeting_attribution.js"] +run-if = ["os == 'mac'"] # osx specific tests + +["test_ASRouterTargeting_snapshot.js"] + +["test_ASRouter_getTargetingParameters.js"] + +["test_AboutHomeStartupCacheChild.js"] + +["test_AboutHomeStartupCacheWorker.js"] +support-files = ["topstories.json"] +skip-if = ["socketprocess_networking"] # Bug 1759035 + +["test_AboutNewTab.js"] + +["test_AboutWelcomeAttribution.js"] + +["test_AboutWelcomeTelemetry.js"] + +["test_AboutWelcomeTelemetry_glean.js"] + +["test_CFRMessageProvider.js"] + +["test_InflightAssetsMessageProvider.js"] + +["test_NimbusRolloutMessageProvider.js"] + +["test_OnboardingMessageProvider.js"] + +["test_PanelTestProvider.js"] + +["test_reach_experiments.js"] + +["test_remoteExperiments.js"] diff --git a/browser/components/pagedata/moz.build b/browser/components/pagedata/moz.build index 19efa5ccc051..f1e49c4e4b9c 100644 --- a/browser/components/pagedata/moz.build +++ b/browser/components/pagedata/moz.build @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. XPCSHELL_TESTS_MANIFESTS += [ - "tests/unit/xpcshell.ini", + "tests/unit/xpcshell.toml", ] BROWSER_CHROME_MANIFESTS += [ "tests/browser/browser.toml", diff --git a/browser/components/pagedata/tests/unit/xpcshell.ini b/browser/components/pagedata/tests/unit/xpcshell.ini deleted file mode 100644 index 3104e61a8636..000000000000 --- a/browser/components/pagedata/tests/unit/xpcshell.ini +++ /dev/null @@ -1,14 +0,0 @@ -[DEFAULT] -firefox-appdir = browser -skip-if = toolkit == 'android' # bug 1730213 -support-files = - head.js -head = head.js - -[test_pagedata_basic.js] -[test_pagedata_schema.js] -[test_opengraph.js] -[test_queue.js] -[test_schemaorg.js] -[test_schemaorg_parse.js] -[test_twitter.js] diff --git a/browser/components/pagedata/tests/unit/xpcshell.toml b/browser/components/pagedata/tests/unit/xpcshell.toml new file mode 100644 index 000000000000..1a94fd5a0abf --- /dev/null +++ b/browser/components/pagedata/tests/unit/xpcshell.toml @@ -0,0 +1,19 @@ +[DEFAULT] +firefox-appdir = "browser" +skip-if = ["toolkit == 'android'"] # bug 1730213 +support-files = ["head.js"] +head = "head.js" + +["test_opengraph.js"] + +["test_pagedata_basic.js"] + +["test_pagedata_schema.js"] + +["test_queue.js"] + +["test_schemaorg.js"] + +["test_schemaorg_parse.js"] + +["test_twitter.js"] diff --git a/browser/components/places/moz.build b/browser/components/places/moz.build index 2517441cc884..6f41de098aff 100644 --- a/browser/components/places/moz.build +++ b/browser/components/places/moz.build @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. XPCSHELL_TESTS_MANIFESTS += [ - "tests/unit/xpcshell.ini", + "tests/unit/xpcshell.toml", ] MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] BROWSER_CHROME_MANIFESTS += [ diff --git a/browser/components/places/tests/unit/xpcshell.ini b/browser/components/places/tests/unit/xpcshell.ini deleted file mode 100644 index 4c0d0f7c9218..000000000000 --- a/browser/components/places/tests/unit/xpcshell.ini +++ /dev/null @@ -1,24 +0,0 @@ -[DEFAULT] -head = head_bookmarks.js -firefox-appdir = browser -skip-if = toolkit == 'android' # bug 1730213 -support-files = - bookmarks.glue.html - bookmarks.glue.json - corruptDB.sqlite - distribution.ini - -[test_browserGlue_bookmarkshtml.js] -[test_browserGlue_corrupt.js] -[test_browserGlue_corrupt_nobackup.js] -[test_browserGlue_corrupt_nobackup_default.js] -[test_browserGlue_distribution.js] -[test_browserGlue_migrate.js] -[test_browserGlue_prefs.js] -[test_browserGlue_restore.js] -[test_clearHistory_shutdown.js] -[test_interactions_blocklist.js] -[test_invalid_defaultLocation.js] -[test_PUIU_batchUpdatesForNode.js] -[test_PUIU_setCharsetForPage.js] -[test_PUIU_title_difference_spotter.js] diff --git a/browser/components/places/tests/unit/xpcshell.toml b/browser/components/places/tests/unit/xpcshell.toml new file mode 100644 index 000000000000..8a9097792279 --- /dev/null +++ b/browser/components/places/tests/unit/xpcshell.toml @@ -0,0 +1,38 @@ +[DEFAULT] +head = "head_bookmarks.js" +firefox-appdir = "browser" +skip-if = ["toolkit == 'android'"] # bug 1730213 +support-files = [ + "bookmarks.glue.html", + "bookmarks.glue.json", + "corruptDB.sqlite", + "distribution.ini", +] + +["test_PUIU_batchUpdatesForNode.js"] + +["test_PUIU_setCharsetForPage.js"] + +["test_PUIU_title_difference_spotter.js"] + +["test_browserGlue_bookmarkshtml.js"] + +["test_browserGlue_corrupt.js"] + +["test_browserGlue_corrupt_nobackup.js"] + +["test_browserGlue_corrupt_nobackup_default.js"] + +["test_browserGlue_distribution.js"] + +["test_browserGlue_migrate.js"] + +["test_browserGlue_prefs.js"] + +["test_browserGlue_restore.js"] + +["test_clearHistory_shutdown.js"] + +["test_interactions_blocklist.js"] + +["test_invalid_defaultLocation.js"] diff --git a/browser/components/search/moz.build b/browser/components/search/moz.build index 6557987677da..406b41600020 100644 --- a/browser/components/search/moz.build +++ b/browser/components/search/moz.build @@ -19,7 +19,7 @@ BROWSER_CHROME_MANIFESTS += [ MARIONETTE_UNIT_MANIFESTS += ["test/marionette/manifest.ini"] -XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"] JAR_MANIFESTS += ["jar.mn"] diff --git a/browser/components/search/test/unit/xpcshell.ini b/browser/components/search/test/unit/xpcshell.ini deleted file mode 100644 index 27ce9b7123cc..000000000000 --- a/browser/components/search/test/unit/xpcshell.ini +++ /dev/null @@ -1,20 +0,0 @@ -[DEFAULT] -support-files = - ../../../../../services/settings/dumps/main/search-config-v2.json -skip-if = toolkit == 'android' # bug 1730213 -firefox-appdir = browser - -[test_search_telemetry_categorization_logic.js] -[test_search_telemetry_categorization_process_domains.js] -[test_search_telemetry_categorization_sync.js] -support-files = - domain_category_mappings_1a.json - domain_category_mappings_1b.json - domain_category_mappings_2a.json - domain_category_mappings_2b.json -[test_search_telemetry_compare_urls.js] -[test_search_telemetry_config_validation.js] -support-files = - ../../schema/search-telemetry-schema.json -[test_urlTelemetry.js] -[test_urlTelemetry_generic.js] diff --git a/browser/components/search/test/unit/xpcshell.toml b/browser/components/search/test/unit/xpcshell.toml new file mode 100644 index 000000000000..b68b0372bb9c --- /dev/null +++ b/browser/components/search/test/unit/xpcshell.toml @@ -0,0 +1,25 @@ +[DEFAULT] +support-files = ["../../../../../services/settings/dumps/main/search-config-v2.json"] +skip-if = ["toolkit == 'android'"] # bug 1730213 +firefox-appdir = "browser" + +["test_search_telemetry_categorization_logic.js"] + +["test_search_telemetry_categorization_process_domains.js"] + +["test_search_telemetry_categorization_sync.js"] +support-files = [ + "domain_category_mappings_1a.json", + "domain_category_mappings_1b.json", + "domain_category_mappings_2a.json", + "domain_category_mappings_2b.json", +] + +["test_search_telemetry_compare_urls.js"] + +["test_search_telemetry_config_validation.js"] +support-files = ["../../schema/search-telemetry-schema.json"] + +["test_urlTelemetry.js"] + +["test_urlTelemetry_generic.js"] diff --git a/browser/components/sessionstore/moz.build b/browser/components/sessionstore/moz.build index 3fb99e97df76..11715411e704 100644 --- a/browser/components/sessionstore/moz.build +++ b/browser/components/sessionstore/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/. -XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"] BROWSER_CHROME_MANIFESTS += ["test/browser.toml"] JAR_MANIFESTS += ["jar.mn"] diff --git a/browser/components/sessionstore/test/unit/xpcshell.ini b/browser/components/sessionstore/test/unit/xpcshell.ini deleted file mode 100644 index b5fadb609d51..000000000000 --- a/browser/components/sessionstore/test/unit/xpcshell.ini +++ /dev/null @@ -1,21 +0,0 @@ -[DEFAULT] -head = head.js -tags = condprof -firefox-appdir = browser -skip-if = toolkit == 'android' # bug 1730213 -support-files = - data/sessionCheckpoints_all.json - data/sessionstore_invalid.js - data/sessionstore_valid.js - -[test_backup_once.js] -skip-if = condprof # 1769154 -[test_final_write_cleanup.js] -[test_histogram_corrupt_files.js] -[test_migration_lz4compression.js] -skip-if = condprof # 1769154 -[test_startup_nosession_async.js] -skip-if = condprof # 1769154 -[test_startup_session_async.js] -[test_startup_invalid_session.js] -skip-if = condprof # 1769154 diff --git a/browser/components/sessionstore/test/unit/xpcshell.toml b/browser/components/sessionstore/test/unit/xpcshell.toml new file mode 100644 index 000000000000..d8f5835f1555 --- /dev/null +++ b/browser/components/sessionstore/test/unit/xpcshell.toml @@ -0,0 +1,28 @@ +[DEFAULT] +head = "head.js" +tags = "condprof" +firefox-appdir = "browser" +skip-if = ["toolkit == 'android'"] # bug 1730213 +support-files = [ + "data/sessionCheckpoints_all.json", + "data/sessionstore_invalid.js", + "data/sessionstore_valid.js", +] + +["test_backup_once.js"] +skip-if = ["condprof"] # 1769154 + +["test_final_write_cleanup.js"] + +["test_histogram_corrupt_files.js"] + +["test_migration_lz4compression.js"] +skip-if = ["condprof"] # 1769154 + +["test_startup_invalid_session.js"] +skip-if = ["condprof"] # 1769154 + +["test_startup_nosession_async.js"] +skip-if = ["condprof"] # 1769154 + +["test_startup_session_async.js"] diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build index fbcb6b9e1070..fe70623907f8 100644 --- a/browser/components/shell/moz.build +++ b/browser/components/shell/moz.build @@ -8,7 +8,7 @@ LOCAL_INCLUDES += ["/xpcom/build"] BROWSER_CHROME_MANIFESTS += ["test/browser.toml"] -XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"] JAR_MANIFESTS += ["jar.mn"] diff --git a/browser/components/shell/test/unit/xpcshell.ini b/browser/components/shell/test/unit/xpcshell.ini deleted file mode 100644 index 383dcb3475db..000000000000 --- a/browser/components/shell/test/unit/xpcshell.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -skip-if = toolkit == 'android' # bug 1730213 -firefox-appdir = browser - -[test_macOS_showSecurityPreferences.js] -skip-if = toolkit != "cocoa" diff --git a/browser/components/shell/test/unit/xpcshell.toml b/browser/components/shell/test/unit/xpcshell.toml new file mode 100644 index 000000000000..02a51628cbcb --- /dev/null +++ b/browser/components/shell/test/unit/xpcshell.toml @@ -0,0 +1,6 @@ +[DEFAULT] +skip-if = ["toolkit == 'android'"] # bug 1730213 +firefox-appdir = "browser" + +["test_macOS_showSecurityPreferences.js"] +run-if = ["os == 'mac'"] diff --git a/browser/components/syncedtabs/moz.build b/browser/components/syncedtabs/moz.build index 6d96d56d9078..8a702d39060e 100644 --- a/browser/components/syncedtabs/moz.build +++ b/browser/components/syncedtabs/moz.build @@ -6,7 +6,7 @@ JAR_MANIFESTS += ["jar.mn"] BROWSER_CHROME_MANIFESTS += ["test/browser/browser.toml"] -XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.toml"] EXTRA_JS_MODULES.syncedtabs += [ "EventEmitter.sys.mjs", diff --git a/browser/components/syncedtabs/test/xpcshell/xpcshell.ini b/browser/components/syncedtabs/test/xpcshell/xpcshell.ini deleted file mode 100644 index 5b18e0757e5e..000000000000 --- a/browser/components/syncedtabs/test/xpcshell/xpcshell.ini +++ /dev/null @@ -1,10 +0,0 @@ -[DEFAULT] -skip-if = toolkit == 'android' # bug 1730213 -head = head.js -firefox-appdir = browser - -[test_EventEmitter.js] -[test_SyncedTabsDeckStore.js] -[test_SyncedTabsListStore.js] -[test_SyncedTabsDeckComponent.js] -[test_TabListComponent.js] diff --git a/browser/components/syncedtabs/test/xpcshell/xpcshell.toml b/browser/components/syncedtabs/test/xpcshell/xpcshell.toml new file mode 100644 index 000000000000..b8435f01f572 --- /dev/null +++ b/browser/components/syncedtabs/test/xpcshell/xpcshell.toml @@ -0,0 +1,14 @@ +[DEFAULT] +skip-if = ["toolkit == 'android'"] # bug 1730213 +head = "head.js" +firefox-appdir = "browser" + +["test_EventEmitter.js"] + +["test_SyncedTabsDeckComponent.js"] + +["test_SyncedTabsDeckStore.js"] + +["test_SyncedTabsListStore.js"] + +["test_TabListComponent.js"] diff --git a/browser/components/tests/unit/xpcshell.ini b/browser/components/tests/unit/xpcshell.ini deleted file mode 100644 index 5a8a1774f0b7..000000000000 --- a/browser/components/tests/unit/xpcshell.ini +++ /dev/null @@ -1,16 +0,0 @@ -[DEFAULT] -head = head.js -firefox-appdir = browser -skip-if = toolkit == 'android' # bug 1730213 -support-files = - distribution.ini - -[test_browserGlue_migration_ctrltab_recently_used_order.js] -[test_browserGlue_migration_formautofill.js] -[test_browserGlue_migration_no_errors.js] -[test_browserGlue_migration_places_xulstore.js] -[test_browserGlue_migration_resetDefaults.js] -[test_browserGlue_migration_remove_pref.js] -[test_distribution.js] -run-sequentially = very high failure rate in parallel -[test_distribution_cachedexistence.js] diff --git a/browser/components/tests/unit/xpcshell.toml b/browser/components/tests/unit/xpcshell.toml new file mode 100644 index 000000000000..c7f6772023dd --- /dev/null +++ b/browser/components/tests/unit/xpcshell.toml @@ -0,0 +1,22 @@ +[DEFAULT] +head = "head.js" +firefox-appdir = "browser" +skip-if = ["toolkit == 'android'"] # bug 1730213 +support-files = ["distribution.ini"] + +["test_browserGlue_migration_ctrltab_recently_used_order.js"] + +["test_browserGlue_migration_formautofill.js"] + +["test_browserGlue_migration_no_errors.js"] + +["test_browserGlue_migration_places_xulstore.js"] + +["test_browserGlue_migration_remove_pref.js"] + +["test_browserGlue_migration_resetDefaults.js"] + +["test_distribution.js"] +run-sequentially = "very high failure rate in parallel" + +["test_distribution_cachedexistence.js"] diff --git a/browser/components/urlbar/moz.build b/browser/components/urlbar/moz.build index c5ce4f640240..aca89a5a0f47 100644 --- a/browser/components/urlbar/moz.build +++ b/browser/components/urlbar/moz.build @@ -87,8 +87,8 @@ BROWSER_CHROME_MANIFESTS += [ "tests/quicksuggest/browser/browser.toml", ] XPCSHELL_TESTS_MANIFESTS += [ - "tests/quicksuggest/unit/xpcshell.ini", - "tests/unit/xpcshell.ini", + "tests/quicksuggest/unit/xpcshell.toml", + "tests/unit/xpcshell.toml", ] SPHINX_TREES["/browser/urlbar"] = "docs" diff --git a/browser/components/urlbar/tests/quicksuggest/unit/xpcshell.ini b/browser/components/urlbar/tests/quicksuggest/unit/xpcshell.ini deleted file mode 100644 index 2525cc332726..000000000000 --- a/browser/components/urlbar/tests/quicksuggest/unit/xpcshell.ini +++ /dev/null @@ -1,26 +0,0 @@ -[DEFAULT] -skip-if = toolkit == 'android' # bug 1730213 -head = ../../unit/head.js head.js -firefox-appdir = browser - -[test_merinoClient.js] -[test_merinoClient_sessions.js] -[test_quicksuggest.js] -[test_quicksuggest_addons.js] -[test_quicksuggest_dynamicWikipedia.js] -[test_quicksuggest_impressionCaps.js] -[test_quicksuggest_mdn.js] -[test_quicksuggest_merino.js] -[test_quicksuggest_merinoSessions.js] -[test_quicksuggest_migrate_v1.js] -[test_quicksuggest_migrate_v2.js] -[test_quicksuggest_nonUniqueKeywords.js] -[test_quicksuggest_offlineDefault.js] -[test_quicksuggest_pocket.js] -[test_quicksuggest_positionInSuggestions.js] -[test_quicksuggest_scoreMap.js] -[test_quicksuggest_topPicks.js] -[test_rust_ingest.js] -[test_suggestionsMap.js] -[test_weather.js] -[test_weather_keywords.js] diff --git a/browser/components/urlbar/tests/quicksuggest/unit/xpcshell.toml b/browser/components/urlbar/tests/quicksuggest/unit/xpcshell.toml new file mode 100644 index 000000000000..3f2a92dec8b8 --- /dev/null +++ b/browser/components/urlbar/tests/quicksuggest/unit/xpcshell.toml @@ -0,0 +1,46 @@ +[DEFAULT] +skip-if = ["toolkit == 'android'"] # bug 1730213 +head = "../../unit/head.js head.js" +firefox-appdir = "browser" + +["test_merinoClient.js"] + +["test_merinoClient_sessions.js"] + +["test_quicksuggest.js"] + +["test_quicksuggest_addons.js"] + +["test_quicksuggest_dynamicWikipedia.js"] + +["test_quicksuggest_impressionCaps.js"] + +["test_quicksuggest_mdn.js"] + +["test_quicksuggest_merino.js"] + +["test_quicksuggest_merinoSessions.js"] + +["test_quicksuggest_migrate_v1.js"] + +["test_quicksuggest_migrate_v2.js"] + +["test_quicksuggest_nonUniqueKeywords.js"] + +["test_quicksuggest_offlineDefault.js"] + +["test_quicksuggest_pocket.js"] + +["test_quicksuggest_positionInSuggestions.js"] + +["test_quicksuggest_scoreMap.js"] + +["test_quicksuggest_topPicks.js"] + +["test_rust_ingest.js"] + +["test_suggestionsMap.js"] + +["test_weather.js"] + +["test_weather_keywords.js"] diff --git a/browser/components/urlbar/tests/unit/xpcshell.ini b/browser/components/urlbar/tests/unit/xpcshell.ini deleted file mode 100644 index ef0242b76500..000000000000 --- a/browser/components/urlbar/tests/unit/xpcshell.ini +++ /dev/null @@ -1,106 +0,0 @@ -[DEFAULT] -skip-if = toolkit == 'android' # bug 1730213 -head = head.js -firefox-appdir = browser -support-files = - data/engine.xml - -[test_000_frecency.js] -[test_about_urls.js] -[test_autofill_adaptiveHistory.js] -[test_autofill_bookmarked.js] -[test_autofill_do_not_trim.js] -[test_autofill_functional.js] -[test_autofill_origins.js] -[test_autofill_origins_alt_frecency.js] -prefs = - places.frecency.origins.alternative.featureGate=true - browser.urlbar.suggest.quickactions=false -[test_autofill_originsAndQueries.js] -[test_autofill_prefix_fallback.js] -[test_autofill_search_engine_aliases.js] -[test_autofill_urls.js] -[test_avoid_stripping_to_empty_tokens.js] -[test_calculator.js] -[test_casing.js] -[test_dedupe_embedded_url_param.js] -[test_dedupe_prefix.js] -[test_dedupe_switchTab.js] -[test_dont_autofill_cases.js] -[test_download_embed_bookmarks.js] -[test_empty_search.js] -[test_encoded_urls.js] -[test_escaping_badEscapedURI.js] -[test_escaping_escapeSelf.js] -[test_exposure.js] -[test_frecency.js] -[test_frecency_alternative_nimbus.js] -[test_heuristic_cancel.js] -[test_hideSponsoredHistory.js] -[test_history_bookmark_results_on_search_service_failure.js] -[test_keywords.js] -skip-if = os == 'linux' # bug 1474616 -[test_l10nCache.js] -[test_local_suggest_prefs.js] -[test_match_javascript.js] -[test_multi_word_search.js] -[test_muxer.js] -[test_pages_alt_frecency.js] -prefs = - places.frecency.pages.alternative.featureGate=true - browser.urlbar.suggest.quickactions=false -[test_protocol_ignore.js] -[test_protocol_swap.js] -[test_providerAliasEngines.js] -[test_providerHeuristicFallback.js] -[test_providerHistoryUrlHeuristic.js] -[test_providerKeywords.js] -[test_providerOmnibox.js] -[test_providerOpenTabs.js] -skip-if = - os == "mac" && debug # Bug 1781972 - os == "win" && debug # Bug 1781972 -[test_providerPlaces.js] -[test_providerPlaces_duplicate_entries.js] -[test_providerPlaces_nonEnglish.js] -[test_providerRecentSearches.js] -[test_providersManager.js] -[test_providersManager_filtering.js] -[test_providersManager_maxResults.js] -[test_providerTabToSearch.js] -[test_providerTabToSearch_partialHost.js] -[test_query_url.js] -[test_queryScorer.js] -[test_quickactions.js] -[test_remote_tabs.js] -skip-if = !sync -[test_resultGroups.js] -[test_search_engine_restyle.js] -[test_search_suggestions.js] -[test_search_suggestions_aliases.js] -[test_search_suggestions_tail.js] -[test_special_search.js] -[test_suggestedIndex.js] -[test_suggestedIndexRelativeToGroup.js] -[test_tab_matches.js] -[test_tags_caseInsensitivity.js] -[test_tags_extendedUnicode.js] -[test_tags_general.js] -[test_tags_matchBookmarkTitles.js] -[test_tags_returnedInSearches.js] -[test_tokenizer.js] -[test_trimming.js] -[test_unitConversion.js] -[test_UrlbarController_integration.js] -[test_UrlbarController_telemetry.js] -[test_UrlbarController_unit.js] -[test_UrlbarPrefs.js] -[test_UrlbarQueryContext.js] -[test_UrlbarQueryContext_restrictSource.js] -[test_UrlbarSearchUtils.js] -[test_UrlbarUtils_addToUrlbarHistory.js] -[test_UrlbarUtils_getShortcutOrURIAndPostData.js] -[test_UrlbarUtils_getTokenMatches.js] -[test_UrlbarUtils_skippableTimer.js] -[test_UrlbarUtils_unEscapeURIForUI.js] -[test_word_boundary_search.js] diff --git a/browser/components/urlbar/tests/unit/xpcshell.toml b/browser/components/urlbar/tests/unit/xpcshell.toml new file mode 100644 index 000000000000..682d19ba7164 --- /dev/null +++ b/browser/components/urlbar/tests/unit/xpcshell.toml @@ -0,0 +1,195 @@ +[DEFAULT] +skip-if = ["toolkit == 'android'"] # bug 1730213 +head = "head.js" +firefox-appdir = "browser" +support-files = ["data/engine.xml"] + +["test_000_frecency.js"] + +["test_UrlbarController_integration.js"] + +["test_UrlbarController_telemetry.js"] + +["test_UrlbarController_unit.js"] + +["test_UrlbarPrefs.js"] + +["test_UrlbarQueryContext.js"] + +["test_UrlbarQueryContext_restrictSource.js"] + +["test_UrlbarSearchUtils.js"] + +["test_UrlbarUtils_addToUrlbarHistory.js"] + +["test_UrlbarUtils_getShortcutOrURIAndPostData.js"] + +["test_UrlbarUtils_getTokenMatches.js"] + +["test_UrlbarUtils_skippableTimer.js"] + +["test_UrlbarUtils_unEscapeURIForUI.js"] + +["test_about_urls.js"] + +["test_autofill_adaptiveHistory.js"] + +["test_autofill_bookmarked.js"] + +["test_autofill_do_not_trim.js"] + +["test_autofill_functional.js"] + +["test_autofill_origins.js"] + +["test_autofill_originsAndQueries.js"] + +["test_autofill_origins_alt_frecency.js"] +prefs = [ + "places.frecency.origins.alternative.featureGate=true", + "browser.urlbar.suggest.quickactions=false", +] + +["test_autofill_prefix_fallback.js"] + +["test_autofill_search_engine_aliases.js"] + +["test_autofill_urls.js"] + +["test_avoid_stripping_to_empty_tokens.js"] + +["test_calculator.js"] + +["test_casing.js"] + +["test_dedupe_embedded_url_param.js"] + +["test_dedupe_prefix.js"] + +["test_dedupe_switchTab.js"] + +["test_dont_autofill_cases.js"] + +["test_download_embed_bookmarks.js"] + +["test_empty_search.js"] + +["test_encoded_urls.js"] + +["test_escaping_badEscapedURI.js"] + +["test_escaping_escapeSelf.js"] + +["test_exposure.js"] + +["test_frecency.js"] + +["test_frecency_alternative_nimbus.js"] + +["test_heuristic_cancel.js"] + +["test_hideSponsoredHistory.js"] + +["test_history_bookmark_results_on_search_service_failure.js"] + +["test_keywords.js"] +skip-if = ["os == 'linux'"] # bug 1474616 + +["test_l10nCache.js"] + +["test_local_suggest_prefs.js"] + +["test_match_javascript.js"] + +["test_multi_word_search.js"] + +["test_muxer.js"] + +["test_pages_alt_frecency.js"] +prefs = [ + "places.frecency.pages.alternative.featureGate=true", + "browser.urlbar.suggest.quickactions=false", +] + +["test_protocol_ignore.js"] + +["test_protocol_swap.js"] + +["test_providerAliasEngines.js"] + +["test_providerHeuristicFallback.js"] + +["test_providerHistoryUrlHeuristic.js"] + +["test_providerKeywords.js"] + +["test_providerOmnibox.js"] + +["test_providerOpenTabs.js"] +skip-if = [ + "os == 'mac' && debug", # Bug 1781972 + "os == 'win' && debug", # Bug 1781972 +] + +["test_providerPlaces.js"] + +["test_providerPlaces_duplicate_entries.js"] + +["test_providerPlaces_nonEnglish.js"] + +["test_providerRecentSearches.js"] + +["test_providerTabToSearch.js"] + +["test_providerTabToSearch_partialHost.js"] + +["test_providersManager.js"] + +["test_providersManager_filtering.js"] + +["test_providersManager_maxResults.js"] + +["test_queryScorer.js"] + +["test_query_url.js"] + +["test_quickactions.js"] + +["test_remote_tabs.js"] +skip-if = ["!sync"] + +["test_resultGroups.js"] + +["test_search_engine_restyle.js"] + +["test_search_suggestions.js"] + +["test_search_suggestions_aliases.js"] + +["test_search_suggestions_tail.js"] + +["test_special_search.js"] + +["test_suggestedIndex.js"] + +["test_suggestedIndexRelativeToGroup.js"] + +["test_tab_matches.js"] + +["test_tags_caseInsensitivity.js"] + +["test_tags_extendedUnicode.js"] + +["test_tags_general.js"] + +["test_tags_matchBookmarkTitles.js"] + +["test_tags_returnedInSearches.js"] + +["test_tokenizer.js"] + +["test_trimming.js"] + +["test_unitConversion.js"] + +["test_word_boundary_search.js"] diff --git a/browser/extensions/formautofill/moz.build b/browser/extensions/formautofill/moz.build index d678c4abbff2..2a94a1934144 100644 --- a/browser/extensions/formautofill/moz.build +++ b/browser/extensions/formautofill/moz.build @@ -42,7 +42,7 @@ BROWSER_CHROME_MANIFESTS += [ ] XPCSHELL_TESTS_MANIFESTS += [ - "test/unit/xpcshell.ini", + "test/unit/xpcshell.toml", ] MOCHITEST_MANIFESTS += [ diff --git a/browser/extensions/formautofill/test/unit/xpcshell.ini b/browser/extensions/formautofill/test/unit/xpcshell.ini deleted file mode 100644 index 16c455e5eaf5..000000000000 --- a/browser/extensions/formautofill/test/unit/xpcshell.ini +++ /dev/null @@ -1,101 +0,0 @@ -[DEFAULT] -skip-if = - (os == "linux") && ccov # bug 1821945 - toolkit == 'android' # bug 1730213 -firefox-appdir = browser -head = head.js -support-files = - ../fixtures/** -prefs = - extensions.formautofill.heuristics.visibilityCheckThreshold=0 - -[test_activeStatus.js] -[test_addressComponent_city.js] -head = head_addressComponent.js -[test_addressComponent_country.js] -head = head_addressComponent.js -[test_addressComponent_email.js] -head = head_addressComponent.js -[test_addressComponent_name.js] -head = head_addressComponent.js -[test_addressComponent_organization.js] -head = head_addressComponent.js -[test_addressComponent_postal_code.js] -head = head_addressComponent.js -[test_addressComponent_state.js] -head = head_addressComponent.js -[test_addressComponent_street_address.js] -head = head_addressComponent.js -[test_addressComponent_tel.js] -head = head_addressComponent.js -[test_addressDataLoader.js] - skip-if = true # bug 1859588 -[test_addressRecords.js] -skip-if = - apple_silicon # bug 1729554 -[test_autofillFormFields.js] -skip-if = - tsan # Times out, bug 1612707 - apple_silicon # bug 1729554 -[test_clearPopulatedForm.js] -[test_collectFormFields.js] -[test_createRecords.js] -[test_creditCardRecords.js] -skip-if = - tsan # Times out, bug 1612707 - apple_silicon # bug 1729554 -[test_extractLabelStrings.js] -[test_findLabelElements.js] -[test_getAdaptedProfiles.js] -[test_getAdaptedProfiles_locales.js] -[test_getCategoriesFromFieldNames.js] -[test_getCreditCardLogo.js] -[test_getFormInputDetails.js] -[test_getInfo.js] -[test_getRecords.js] -skip-if = - tsan # Times out, bug 1612707 - apple_silicon # bug 1729554 -[test_isAddressAutofillAvailable.js] -[test_isCJKName.js] -[test_isCreditCardAutofillAvailable.js] -[test_isCreditCardOrAddressFieldType.js] -[test_known_strings.js] -[test_markAsAutofillField.js] -[test_migrateRecords.js] -skip-if = tsan # Times out, bug 1612707 -[test_nameUtils.js] -[test_onFormSubmitted.js] -skip-if = tsan # Times out, bug 1612707 -[test_parseStreetAddress.js] -[test_parseAddressFormat.js] -[test_previewFormFields.js] -[test_profileAutocompleteResult.js] -[test_phoneNumber.js] -[test_reconcile.js] -skip-if = - tsan # Times out, bug 1612707 - apple_silicon # bug 1729554 -[test_savedFieldNames.js] -[test_toOneLineAddress.js] -[test_storage_tombstones.js] -skip-if = - tsan # Times out, bug 1612707 - apple_silicon # bug 1729554 -[test_storage_remove.js] -skip-if = - tsan # Times out, bug 1612707 - apple_silicon # bug 1729554 -[test_storage_syncfields.js] -[test_transformFields.js] -skip-if = - tsan # Times out, bug 1612707 - apple_silicon # bug 1729554 -[test_sync.js] -head = head.js ../../../../../services/sync/tests/unit/head_appinfo.js ../../../../../services/common/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_http_server.js -skip-if = tsan # Times out, bug 1612707 -[test_sync_deprecate_credit_card_v4.js] -head = head.js ../../../../../services/sync/tests/unit/head_appinfo.js ../../../../../services/common/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_http_server.js -skip-if = - tsan # Times out, bug 1612707 - apple_silicon # bug 1729554 diff --git a/browser/extensions/formautofill/test/unit/xpcshell.toml b/browser/extensions/formautofill/test/unit/xpcshell.toml new file mode 100644 index 000000000000..9e5b2a206ab9 --- /dev/null +++ b/browser/extensions/formautofill/test/unit/xpcshell.toml @@ -0,0 +1,155 @@ +[DEFAULT] +skip-if = [ + "os == 'linux' && ccov", # bug 1821945 + "toolkit == 'android'", # bug 1730213 +] +firefox-appdir = "browser" +head = "head.js" +support-files = ["../fixtures/**"] +prefs = ["extensions.formautofill.heuristics.visibilityCheckThreshold=0"] + +["test_activeStatus.js"] + +["test_addressComponent_city.js"] +head = "head_addressComponent.js" + +["test_addressComponent_country.js"] +head = "head_addressComponent.js" + +["test_addressComponent_email.js"] +head = "head_addressComponent.js" + +["test_addressComponent_name.js"] +head = "head_addressComponent.js" + +["test_addressComponent_organization.js"] +head = "head_addressComponent.js" + +["test_addressComponent_postal_code.js"] +head = "head_addressComponent.js" + +["test_addressComponent_state.js"] +head = "head_addressComponent.js" + +["test_addressComponent_street_address.js"] +head = "head_addressComponent.js" + +["test_addressComponent_tel.js"] +head = "head_addressComponent.js" + +["test_addressDataLoader.js"] +skip-if = ["true"] # bug 1859588 + +["test_addressRecords.js"] +skip-if = ["apple_silicon"] # bug 1729554 + +["test_autofillFormFields.js"] +skip-if = [ + "tsan", # Times out, bug 1612707 + "apple_silicon", # bug 1729554 +] + +["test_clearPopulatedForm.js"] + +["test_collectFormFields.js"] + +["test_createRecords.js"] + +["test_creditCardRecords.js"] +skip-if = [ + "tsan", # Times out, bug 1612707 + "apple_silicon", # bug 1729554 +] + +["test_extractLabelStrings.js"] + +["test_findLabelElements.js"] + +["test_getAdaptedProfiles.js"] + +["test_getAdaptedProfiles_locales.js"] + +["test_getCategoriesFromFieldNames.js"] + +["test_getCreditCardLogo.js"] + +["test_getFormInputDetails.js"] + +["test_getInfo.js"] + +["test_getRecords.js"] +skip-if = [ + "tsan", # Times out, bug 1612707 + "apple_silicon", # bug 1729554 +] + +["test_isAddressAutofillAvailable.js"] + +["test_isCJKName.js"] + +["test_isCreditCardAutofillAvailable.js"] + +["test_isCreditCardOrAddressFieldType.js"] + +["test_known_strings.js"] + +["test_markAsAutofillField.js"] + +["test_migrateRecords.js"] +skip-if = ["tsan"] # Times out, bug 1612707 + +["test_nameUtils.js"] + +["test_onFormSubmitted.js"] +skip-if = ["tsan"] # Times out, bug 1612707 + +["test_parseAddressFormat.js"] + +["test_parseStreetAddress.js"] + +["test_phoneNumber.js"] + +["test_previewFormFields.js"] + +["test_profileAutocompleteResult.js"] + +["test_reconcile.js"] +skip-if = [ + "tsan", # Times out, bug 1612707 + "apple_silicon", # bug 1729554 +] + +["test_savedFieldNames.js"] + +["test_storage_remove.js"] +skip-if = [ + "tsan", # Times out, bug 1612707 + "apple_silicon", # bug 1729554 +] + +["test_storage_syncfields.js"] + +["test_storage_tombstones.js"] +skip-if = [ + "tsan", # Times out, bug 1612707 + "apple_silicon", # bug 1729554 +] + +["test_sync.js"] +head = "head.js ../../../../../services/sync/tests/unit/head_appinfo.js ../../../../../services/common/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_http_server.js" +skip-if = ["tsan"] # Times out, bug 1612707 + +["test_sync_deprecate_credit_card_v4.js"] +head = "head.js ../../../../../services/sync/tests/unit/head_appinfo.js ../../../../../services/common/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_http_server.js" +skip-if = [ + "tsan", # Times out, bug 1612707 + "apple_silicon", # bug 1729554 +] + +["test_toOneLineAddress.js"] + +["test_transformFields.js"] +skip-if = [ + "tsan", # Times out, bug 1612707 + "apple_silicon", # bug 1729554 +] diff --git a/browser/modules/moz.build b/browser/modules/moz.build index 62111be7684d..52a411360b12 100644 --- a/browser/modules/moz.build +++ b/browser/modules/moz.build @@ -118,7 +118,7 @@ BROWSER_CHROME_MANIFESTS += [ "test/browser/browser.toml", "test/browser/formValidation/browser.toml", ] -XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"] EXTRA_JS_MODULES += [ "AboutNewTab.sys.mjs", diff --git a/browser/modules/test/unit/xpcshell.ini b/browser/modules/test/unit/xpcshell.ini deleted file mode 100644 index d7bda83c7715..000000000000 --- a/browser/modules/test/unit/xpcshell.ini +++ /dev/null @@ -1,23 +0,0 @@ -[DEFAULT] -head = -firefox-appdir = browser -skip-if = toolkit == 'android' # bug 1730213 - -[test_E10SUtils_nested_URIs.js] -[test_HomePage.js] -[test_HomePage_ignore.js] -[test_Sanitizer_interrupted.js] -[test_SitePermissions.js] -[test_SitePermissions_temporary.js] -[test_SiteDataManager.js] -[test_SiteDataManagerContainers.js] -[test_TabUnloader.js] -[test_LaterRun.js] -[test_discovery.js] -[test_PingCentre.js] -[test_ProfileCounter.js] -skip-if = os != 'win' # Test of a Windows-specific feature -[test_InstallationTelemetry.js] -skip-if = - os != 'win' # Test of a Windows-specific feature -[test_PartnerLinkAttribution.js] diff --git a/browser/modules/test/unit/xpcshell.toml b/browser/modules/test/unit/xpcshell.toml new file mode 100644 index 000000000000..140439f8b9a7 --- /dev/null +++ b/browser/modules/test/unit/xpcshell.toml @@ -0,0 +1,36 @@ +[DEFAULT] +head = '' # no value from INI +firefox-appdir = "browser" +skip-if = ["toolkit == 'android'"] # bug 1730213 + +["test_E10SUtils_nested_URIs.js"] + +["test_HomePage.js"] + +["test_HomePage_ignore.js"] + +["test_InstallationTelemetry.js"] +run-if = ["os == 'win'"] # Test of a Windows-specific feature + +["test_LaterRun.js"] + +["test_PartnerLinkAttribution.js"] + +["test_PingCentre.js"] + +["test_ProfileCounter.js"] +run-if = ["os == 'win'"] # Test of a Windows-specific feature + +["test_Sanitizer_interrupted.js"] + +["test_SiteDataManager.js"] + +["test_SiteDataManagerContainers.js"] + +["test_SitePermissions.js"] + +["test_SitePermissions_temporary.js"] + +["test_TabUnloader.js"] + +["test_discovery.js"] diff --git a/browser/tools/mozscreenshots/moz.build b/browser/tools/mozscreenshots/moz.build index c1d8dcdc23c1..ffa4017a0ded 100644 --- a/browser/tools/mozscreenshots/moz.build +++ b/browser/tools/mozscreenshots/moz.build @@ -34,4 +34,4 @@ TEST_DIRS += [ "mozscreenshots/extension", ] -XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"] +XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.toml"] diff --git a/browser/tools/mozscreenshots/tests/xpcshell/xpcshell.ini b/browser/tools/mozscreenshots/tests/xpcshell/xpcshell.ini deleted file mode 100644 index c318ae4971d3..000000000000 --- a/browser/tools/mozscreenshots/tests/xpcshell/xpcshell.ini +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -skip-if = toolkit == 'android' # bug 1730213 -support-files = ../../mozscreenshots/extension/TestRunner.sys.mjs - -[test_testConfigurations.js] diff --git a/browser/tools/mozscreenshots/tests/xpcshell/xpcshell.toml b/browser/tools/mozscreenshots/tests/xpcshell/xpcshell.toml new file mode 100644 index 000000000000..58cd750a4cdc --- /dev/null +++ b/browser/tools/mozscreenshots/tests/xpcshell/xpcshell.toml @@ -0,0 +1,5 @@ +[DEFAULT] +skip-if = ["toolkit == 'android'"] # bug 1730213 +support-files = ["../../mozscreenshots/extension/TestRunner.sys.mjs"] + +["test_testConfigurations.js"]