Skip to content

Commit 2cae29b

Browse files
committed
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
1 parent afcef64 commit 2cae29b

File tree

68 files changed

+961
-641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+961
-641
lines changed

browser/components/about/moz.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ EXPORTS.mozilla.browser += [
1111
"AboutRedirector.h",
1212
]
1313

14-
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
14+
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"]
1515

1616
SOURCES += [
1717
"AboutRedirector.cpp",

browser/components/about/test/unit/xpcshell.ini

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[DEFAULT]
2+
skip-if = ["toolkit == 'android'"] # bug 1730213
3+
head = '' # no value from INI
4+
# make the firefox services (eg newtab-service) available to xpcshell
5+
firefox-appdir = "browser"
6+
7+
["test_getURIFlags.js"]

browser/components/aboutlogins/moz.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ FINAL_TARGET_FILES.actors += [
2020

2121
BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.toml"]
2222
MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"]
23-
XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"]
23+
XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.toml"]

browser/components/aboutlogins/tests/unit/xpcshell.ini

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[DEFAULT]
2+
skip-if = ["toolkit == 'android'"] # bug 1730213
3+
head = "head.js"
4+
firefox-appdir = "browser"
5+
6+
["test_getPotentialBreachesByLoginGUID.js"]
7+
tags = "remote-settings"

browser/components/attribution/moz.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
with Files("**"):
88
BUG_COMPONENT = ("Toolkit", "Telemetry")
99

10-
XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"]
10+
XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.toml"]
1111

1212
BROWSER_CHROME_MANIFESTS += ["test/browser/browser.toml"]
1313

browser/components/attribution/test/xpcshell/xpcshell.ini

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[DEFAULT]
2+
firefox-appdir = "browser"
3+
run-if = [
4+
"os == 'win'",
5+
"os == 'mac'",
6+
]
7+
head = "head.js"
8+
prefs = ["browser.attribution.macos.enabled=true"]
9+
10+
["test_AttributionCode.js"]
11+
12+
["test_MacAttribution.js"]
13+
run-if = ["os == 'mac'"] # osx specific tests
14+
15+
["test_attribution_parsing.js"]

browser/components/customizableui/moz.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ DIRS += [
99
]
1010

1111
BROWSER_CHROME_MANIFESTS += ["test/browser.toml"]
12-
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
12+
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"]
1313

1414
TESTING_JS_MODULES += [
1515
"test/CustomizableUITestUtils.sys.mjs",

browser/components/customizableui/test/unit/xpcshell.ini

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[DEFAULT]
2+
head = '' # no value from INI
3+
skip-if = ["toolkit == 'android'"] # bug 1730213
4+
firefox-appdir = "browser"
5+
6+
["test_unified_extensions_migration.js"]

browser/components/doh/moz.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ TESTING_JS_MODULES += [
1818
"DoHTestUtils.sys.mjs",
1919
]
2020

21-
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
21+
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"]
2222
BROWSER_CHROME_MANIFESTS += ["test/browser/browser.toml"]

browser/components/doh/test/unit/xpcshell.ini

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[DEFAULT]
2+
skip-if = ["toolkit == 'android'"] # bug 1730213
3+
head = "head.js"
4+
firefox-appdir = "browser"
5+
support-files = ["../../../../../netwerk/test/unit/http2-ca.pem"]
6+
7+
["test_DNSLookup.js"]
8+
skip-if = ["debug"] # Bug 1617845
9+
10+
["test_LookupAggregator.js"]
11+
12+
["test_TRRRacer.js"]
13+
14+
["test_heuristics.js"]

browser/components/downloads/moz.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ if toolkit == "cocoa":
2727
with Files("**"):
2828
BUG_COMPONENT = ("Firefox", "Downloads Panel")
2929

30-
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
30+
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"]

browser/components/downloads/test/unit/xpcshell.ini

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[DEFAULT]
2+
head = "head.js"
3+
firefox-appdir = "browser"
4+
skip-if = ["toolkit == 'android'"] # bug 1730213
5+
6+
["test_DownloadLastDir_basics.js"]
7+
8+
["test_DownloadsCommon_getMimeInfo.js"]
9+
10+
["test_DownloadsCommon_isFileOfType.js"]
11+
12+
["test_DownloadsViewableInternally.js"]

browser/components/enterprisepolicies/tests/moz.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ BROWSER_CHROME_MANIFESTS += [
1717
"browser/show_home_button/browser.toml",
1818
]
1919

20-
XPCSHELL_TESTS_MANIFESTS += ["xpcshell/xpcshell.ini"]
20+
XPCSHELL_TESTS_MANIFESTS += ["xpcshell/xpcshell.toml"]

browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini

Lines changed: 0 additions & 33 deletions
This file was deleted.
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
[DEFAULT]
2+
skip-if = ["toolkit == 'android'"] # bug 1730213
3+
firefox-appdir = "browser"
4+
head = "head.js"
5+
support-files = ["policytest_v0.1.xpi"]
6+
7+
["test_3rdparty.js"]
8+
9+
["test_addon_update.js"]
10+
11+
["test_appupdatepin.js"]
12+
13+
["test_appupdateurl.js"]
14+
15+
["test_bug1658259.js"]
16+
17+
["test_cleanup.js"]
18+
19+
["test_clear_blocked_cookies.js"]
20+
21+
["test_containers.js"]
22+
23+
["test_defaultbrowsercheck.js"]
24+
25+
["test_empty_policy.js"]
26+
27+
["test_exempt_domain_file_type_pairs_from_file_type_download_warnings.js"]
28+
29+
["test_extensions.js"]
30+
31+
["test_extensionsettings.js"]
32+
33+
["test_macosparser_unflatten.js"]
34+
run-if = ["os == 'mac'"]
35+
36+
["test_permissions.js"]
37+
38+
["test_policy_search_engine.js"]
39+
40+
["test_popups_cookies_addons.js"]
41+
support-files = ["config_popups_cookies_addons.json"]
42+
43+
["test_preferences.js"]
44+
45+
["test_proxy.js"]
46+
47+
["test_requestedlocales.js"]
48+
49+
["test_runOnce_helper.js"]
50+
51+
["test_simple_pref_policies.js"]
52+
53+
["test_sorted_alphabetically.js"]
54+
55+
["test_telemetry.js"]

browser/components/extensions/moz.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ BROWSER_CHROME_MANIFESTS += [
3333

3434
MOCHITEST_MANIFESTS += ["test/mochitest/mochitest.toml"]
3535
XPCSHELL_TESTS_MANIFESTS += [
36-
"test/xpcshell/xpcshell.ini",
36+
"test/xpcshell/xpcshell.toml",
3737
]

browser/components/extensions/test/xpcshell/xpcshell.ini

Lines changed: 0 additions & 48 deletions
This file was deleted.
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
[DEFAULT]
2+
skip-if = ["os == 'android'"] # bug 1730213
3+
head = "head.js"
4+
firefox-appdir = "browser"
5+
tags = "webextensions condprof"
6+
dupe-manifest = ""
7+
8+
["test_ext_bookmarks.js"]
9+
skip-if = ["condprof"] # Bug 1769184 - by design for now
10+
11+
["test_ext_browsingData_downloads.js"]
12+
13+
["test_ext_browsingData_passwords.js"]
14+
skip-if = ["tsan"] # Times out, bug 1612707
15+
16+
["test_ext_browsingData_settings.js"]
17+
18+
["test_ext_chrome_settings_overrides_home.js"]
19+
20+
["test_ext_chrome_settings_overrides_update.js"]
21+
22+
["test_ext_distribution_popup.js"]
23+
24+
["test_ext_history.js"]
25+
26+
["test_ext_homepage_overrides_private.js"]
27+
28+
["test_ext_manifest.js"]
29+
30+
["test_ext_manifest_commands.js"]
31+
run-sequentially = "very high failure rate in parallel"
32+
33+
["test_ext_manifest_omnibox.js"]
34+
35+
["test_ext_manifest_permissions.js"]
36+
37+
["test_ext_menu_caller.js"]
38+
39+
["test_ext_menu_startup.js"]
40+
41+
["test_ext_normandyAddonStudy.js"]
42+
43+
["test_ext_pageAction_shutdown.js"]
44+
45+
["test_ext_pkcs11_management.js"]
46+
47+
["test_ext_settings_overrides_defaults.js"]
48+
skip-if = ["condprof"] # Bug 1776135 - by design, modifies search settings at start of test
49+
support-files = [
50+
"data/test/manifest.json",
51+
"data/test2/manifest.json",
52+
]
53+
54+
["test_ext_settings_overrides_search.js"]
55+
56+
["test_ext_settings_overrides_search_mozParam.js"]
57+
skip-if = ["condprof"] # Bug 1776652
58+
support-files = ["data/test/manifest.json"]
59+
60+
["test_ext_settings_overrides_shutdown.js"]
61+
62+
["test_ext_settings_validate.js"]
63+
64+
["test_ext_topSites.js"]
65+
skip-if = ["condprof"] # Bug 1769184 - by design for now
66+
67+
["test_ext_url_overrides_newtab.js"]
68+
69+
["test_ext_url_overrides_newtab_update.js"]
70+
71+
["test_ext_urlbar.js"]
72+
skip-if = [
73+
"tsan", # Unreasonably slow, bug 1612707
74+
"condprof", # Bug 1769184 - by design for now
75+
]

0 commit comments

Comments
 (0)