Skip to content

Commit

Permalink
Bug 1859893 - batch 15 - migrate xpcshell.ini -> .toml. r=aryx,geckov…
Browse files Browse the repository at this point in the history
…iew-reviewers,extension-reviewers,valentin,cookie-reviewers,pbz,owlish,robwu

Differential Revision: https://phabricator.services.mozilla.com/D194384
  • Loading branch information
jmaher committed Nov 24, 2023
1 parent fe25132 commit 9d203b1
Show file tree
Hide file tree
Showing 79 changed files with 2,739 additions and 1,789 deletions.
2 changes: 1 addition & 1 deletion extensions/permissions/test/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ TEST_DIRS += [
]

XPCSHELL_TESTS_MANIFESTS += [
"unit/xpcshell.ini",
"unit/xpcshell.toml",
]

BROWSER_CHROME_MANIFESTS += ["browser.toml"]
60 changes: 0 additions & 60 deletions extensions/permissions/test/unit/xpcshell.ini

This file was deleted.

94 changes: 94 additions & 0 deletions extensions/permissions/test/unit/xpcshell.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
[DEFAULT]
head = "head.js"

["test_permmanager_cleardata.js"]

["test_permmanager_default_pref.js"]

["test_permmanager_defaults.js"]

["test_permmanager_expiration.js"]
skip-if = [
"win10_2009", # Bug 1718292
"win11_2009", # Bug 1797751
]

["test_permmanager_getAllByTypeSince.js"]

["test_permmanager_getAllByTypes.js"]

["test_permmanager_getAllForPrincipal.js"]

["test_permmanager_getAllWithTypePrefix.js"]

["test_permmanager_getPermissionObject.js"]

["test_permmanager_idn.js"]

["test_permmanager_ipc.js"]
# This test is meant to run on a multi process mode
# and with file urls loaded in their own child process.
skip-if = ["!e10s"]
firefox-appdir = "browser"

["test_permmanager_load_invalid_entries.js"]
skip-if = ["debug == true"]

["test_permmanager_local_files.js"]

["test_permmanager_matches.js"]

["test_permmanager_matchesuri.js"]

["test_permmanager_migrate_10-11.js"]
skip-if = ["os == 'android'"] # Android doesn't use places

["test_permmanager_migrate_11-12.js"]
skip-if = ["os == 'android'"] # Android doesn't use places

["test_permmanager_migrate_4-7.js"]
skip-if = ["os == 'android'"] # Android doesn't use places

["test_permmanager_migrate_4-7_no_history.js"]
skip-if = [
"apple_silicon", # Disabled due to bleedover with other tests when run in regular suites; passes in "failures" jobs
"os == 'android'"
]

["test_permmanager_migrate_5-7a.js"]
skip-if = ["os == 'android'"] # Android doesn't use places

["test_permmanager_migrate_5-7b.js"]
skip-if = ["os == 'android'"] # Android doesn't use places

["test_permmanager_migrate_6-7a.js"]
skip-if = ["os == 'android'"] # Android doesn't use places

["test_permmanager_migrate_6-7b.js"]
skip-if = ["os == 'android'"] # Android doesn't use places

["test_permmanager_migrate_7-8.js"]
skip-if = ["os == 'android'"] # Android doesn't use places

["test_permmanager_migrate_9-10.js"]
skip-if = ["os == 'android'"] # Android doesn't use places

["test_permmanager_notifications.js"]

["test_permmanager_oa_strip.js"]

["test_permmanager_remove_add_update.js"]

["test_permmanager_removeall.js"]

["test_permmanager_removebytype.js"]

["test_permmanager_removebytypesince.js"]

["test_permmanager_removepermission.js"]

["test_permmanager_removesince.js"]

["test_permmanager_site_scope.js"]

["test_permmanager_subdomains.js"]
2 changes: 1 addition & 1 deletion extensions/pref/autoconfig/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@

DIRS += ["src"]

XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini", "test/unit/xpcshell_snap.ini"]
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml", "test/unit/xpcshell_snap.toml"]

MARIONETTE_UNIT_MANIFESTS += ["test/marionette/manifest.ini"]
23 changes: 0 additions & 23 deletions extensions/pref/autoconfig/test/unit/xpcshell.ini

This file was deleted.

29 changes: 29 additions & 0 deletions extensions/pref/autoconfig/test/unit/xpcshell.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[DEFAULT]
head = ""
skip-if = [
"os == 'android'",
"os == 'win' && msix", # Does not work in MSIX builds.
]
support-files = [
"autoconfig-all.cfg",
"autoconfig-latin1.cfg",
"autoconfig-utf8.cfg",
"autoconfig-chromecheck.cfg",
"autoconfig-no-sandbox-check.cfg",
"autoconfig.js",
"autoconfig-no-sandbox.js",
]

["test_autoconfig.js"]

["test_autoconfig_custom_path.js"]
run-if = ["os == 'linux'"]

["test_autoconfig_default_path.js"]
run-if = ["os == 'linux'"]

["test_autoconfig_no_sandbox.js"]
run-sequentially = "very high failure rate in parallel"

["test_autoconfig_nonascii.js"]
run-sequentially = "very high failure rate in parallel"
8 changes: 0 additions & 8 deletions extensions/pref/autoconfig/test/unit/xpcshell_snap.ini

This file was deleted.

9 changes: 9 additions & 0 deletions extensions/pref/autoconfig/test/unit/xpcshell_snap.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[DEFAULT]
head = ""
run-if = ["os == 'linux'"]

["test_autoconfig_snap.js"]
support-files = [
"autoconfig_snap.js",
"autoconfig-snap.cfg",
]
2 changes: 1 addition & 1 deletion extensions/spellcheck/hunspell/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ if not CONFIG["MOZ_WASM_SANDBOXING_HUNSPELL"]:
DIRS += ["src"]

if CONFIG["ENABLE_TESTS"]:
XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"]
XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.toml"]
8 changes: 0 additions & 8 deletions extensions/spellcheck/hunspell/tests/unit/xpcshell.ini

This file was deleted.

9 changes: 9 additions & 0 deletions extensions/spellcheck/hunspell/tests/unit/xpcshell.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[DEFAULT]
head = ""
skip-if = ["os == 'android'"]
support-files = ["data/**"]
firefox-appdir = "browser"

["test_hunspell.js"]

["test_hunspell_unicode_paths.js"]
2 changes: 1 addition & 1 deletion image/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ MOCHITEST_MANIFESTS += ["test/mochitest/mochitest.toml"]

MOCHITEST_CHROME_MANIFESTS += ["test/mochitest/chrome.toml"]

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

XPIDL_SOURCES += [
"imgICache.idl",
Expand Down
42 changes: 0 additions & 42 deletions image/test/unit/xpcshell.ini

This file was deleted.

50 changes: 50 additions & 0 deletions image/test/unit/xpcshell.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[DEFAULT]
head = ""
support-files = [
"async_load_tests.js",
"bug413512.ico",
"bug815359.ico",
"image1.png",
"image1.webp",
"image1quality50.webp",
"image1png16x16.jpg",
"image1png64x64.jpg",
"image2.jpg",
"image2jpg16x16-win.png",
"image2jpg16x16.png",
"image2jpg16x16cropped.jpg",
"image2jpg16x16cropped2.jpg",
"image2jpg16x32cropped3.jpg",
"image2jpg16x32scaled.jpg",
"image2jpg32x16cropped4.jpg",
"image2jpg32x16scaled.jpg",
"image2jpg32x32-win.png",
"image2jpg32x32.jpg",
"image2jpg32x32.png",
"image3.ico",
"image3ico16x16.png",
"image3ico32x32.png",
"image4.gif",
"image4gif16x16bmp24bpp.ico",
"image4gif16x16bmp32bpp.ico",
"image4gif32x32bmp24bpp.ico",
"image4gif32x32bmp32bpp.ico",
"image_load_helpers.js",
]


["test_async_notification.js"]

["test_async_notification_404.js"]

["test_async_notification_animated.js"]

["test_encoder_apng.js"]

["test_encoder_png.js"]

["test_imgtools.js"]

["test_moz_icon_uri.js"]

["test_private_channel.js"]
17 changes: 0 additions & 17 deletions intl/benchmarks/xpcshell.ini

This file was deleted.

Loading

0 comments on commit 9d203b1

Please sign in to comment.