Skip to content

Commit 807575f

Browse files
jmaherjmaher
committed
Bug 1873732 - remove outdated manifest conditions and use consistent conditions. r=aryx,necko-reviewers,jgilbert,settings-reviewers,credential-management-reviewers,devtools-reviewers,sessionstore-reviewers,dom-storage-reviewers,sgalich,kershaw,nchevobbe,janv,dao
Differential Revision: https://phabricator.services.mozilla.com/D198082
1 parent 990fdd2 commit 807575f

File tree

97 files changed

+206
-233
lines changed

Some content is hidden

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

97 files changed

+206
-233
lines changed

‎browser/base/content/test/general/browser.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@ skip-if = ["os == 'linux' && fission && tsan"] # high frequency intermittent
355355

356356
["browser_newWindowDrop.js"]
357357
https_first_disabled = true
358-
skip-if = ["os == 'win' && os_version == '6.1'"] # bug 1715862
359358
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
360359

361360
["browser_new_http_window_opened_from_file_tab.js"]
@@ -388,7 +387,7 @@ https_first_disabled = true
388387
skip-if = [
389388
"os == 'mac'",
390389
"os == 'linux' && !debug",
391-
"os == 'win' && bits == 32",
390+
"win11_2009 && bits == 32",
392391
] # Bug 1559410 for all instances
393392
support-files = [
394393
"refresh_header.sjs",
@@ -463,15 +462,14 @@ https_first_disabled = true
463462
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
464463

465464
["browser_tab_drag_drop_perwindow.js"]
466-
skip-if = ["os == 'win' && os_version == '6.1' && bits == 32"] # bug 1717587
467465
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
468466

469467
["browser_tab_dragdrop.js"]
470468
skip-if = ["true"] # Bug 1312436, Bug 1388973
471469
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
472470

473471
["browser_tab_dragdrop2.js"]
474-
skip-if = ["os == 'win' && bits == 32 && !debug"] # high frequency win7 intermittent: crash
472+
skip-if = ["win11_2009 && bits == 32 && !debug"] # high frequency win7 intermittent: crash
475473
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
476474

477475
["browser_tabfocus.js"]

‎browser/base/content/test/performance/browser.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ skip-if = [
8888
["browser_tabstrip_overflow_underflow.js"]
8989
skip-if = [
9090
"os == 'win' && verify && !debug",
91-
"os == 'win' && bits == 32",
91+
"win11_2009 && bits == 32",
9292
]
9393

9494
["browser_tabswitch.js"]
@@ -97,13 +97,13 @@ skip-if = ["os == 'win'"] #Bug 1455054
9797
["browser_toolbariconcolor_restyles.js"]
9898

9999
["browser_urlbar_keyed_search.js"]
100-
skip-if = ["os == 'win' && bits == 32"] # # Disabled on Win32 because of intermittent OOM failures (bug 1448241)
100+
skip-if = ["win11_2009 && bits == 32"] # # Disabled on Win32 because of intermittent OOM failures (bug 1448241)
101101

102102
["browser_urlbar_search.js"]
103103
skip-if = [
104104
"os == 'linux' && (debug || ccov)", # Disabled on Linux debug and ccov due to intermittent timeouts. Bug 1414126.
105105
"os == 'win' && (debug || ccov)", # Disabled on Windows debug and ccov due to intermittent timeouts. bug 1426611.
106-
"os == 'win' && bits == 32",
106+
"win11_2009 && bits == 32",
107107
]
108108

109109
["browser_vsync_accessibility.js"]

‎browser/base/content/test/performance/io/browser.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ environment = [
3131
skip-if = [
3232
"apple_silicon", # bug 1707724
3333
"socketprocess_networking",
34-
"os == 'win' && bits == 32",
34+
"win11_2009 && bits == 32",
3535
"os == 'win' && msix", # Bug 1833639
3636
]
3737

‎browser/base/content/test/plugins/browser.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ support-files = [
88
["browser_bug797677.js"]
99

1010
["browser_enable_DRM_prompt.js"]
11-
skip-if = ["(os == 'win' && processor == 'aarch64')"] # bug 1533164
1211

1312
["browser_globalplugin_crashinfobar.js"]
14-
skip-if = ["!crashreporter"]
13+
run-if = ["crashreporter"]
1514

1615
["browser_private_browsing_eme_persistent_state.js"]

‎browser/base/content/test/popupNotifications/browser.toml

Lines changed: 48 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,97 @@
22
support-files = ["head.js"]
33

44
["browser_displayURI.js"]
5-
skip-if = ["(os == 'linux' && (debug || asan))"]
5+
skip-if = [
6+
"os == 'linux' && debug",
7+
"os == 'linux' && asan",
8+
]
69

710
["browser_popupNotification.js"]
8-
skip-if = ["(os == 'linux' && (debug || asan))"]
11+
skip-if = [
12+
"os == 'linux' && debug",
13+
"os == 'linux' && asan",
14+
]
915

1016
["browser_popupNotification_2.js"]
1117
https_first_disabled = true
1218
skip-if = [
13-
"os == 'linux' && (debug || asan)", # bug 1251135
19+
"os == 'linux' && debug", # bug 1251135
20+
"os == 'linux' && asan", # bug 1251135
1421
"os == 'linux' && bits == 64 && os_version == '18.04'", # bug 1251135
1522
]
1623

1724
["browser_popupNotification_3.js"]
1825
https_first_disabled = true
1926
skip-if = [
20-
"os == 'linux' && (debug || asan)",
27+
"os == 'linux' && debug",
28+
"os == 'linux' && asan",
2129
"verify",
2230
]
2331

2432
["browser_popupNotification_4.js"]
25-
skip-if = ["(os == 'linux' && (debug || asan))"]
33+
skip-if = [
34+
"os == 'linux' && debug",
35+
"os == 'linux' && asan",
36+
]
2637

2738
["browser_popupNotification_5.js"]
2839
skip-if = ["true"] # bug 1332646
2940

3041
["browser_popupNotification_accesskey.js"]
3142
skip-if = [
32-
"(os == 'linux' && (debug || asan))",
43+
"os == 'linux' && debug",
44+
"os == 'linux' && asan",
3345
"os == 'mac'",
3446
]
3547

3648
["browser_popupNotification_checkbox.js"]
3749
skip-if = [
38-
"(os == 'linux' && (debug || asan))",
50+
"os == 'linux' && debug",
51+
"os == 'linux' && asan",
3952
"a11y_checks", # Bug 1858037 to investigate intermittent a11y_checks results (fails on Try, passes on Autoland)
4053
]
4154

4255
["browser_popupNotification_hide_after_identity_panel.js"]
43-
skip-if = ["(os == 'linux' && (debug || asan))"]
56+
skip-if = [
57+
"os == 'linux' && debug",
58+
"os == 'linux' && asan",
59+
]
4460

4561
["browser_popupNotification_hide_after_protections_panel.js"]
46-
skip-if = ["(os == 'linux' && (debug || asan))"]
62+
skip-if = [
63+
"os == 'linux' && debug",
64+
"os == 'linux' && asan",
65+
]
4766

4867
["browser_popupNotification_keyboard.js"]
49-
skip-if = ["(os == 'linux' && (debug || asan))"]
68+
skip-if = [
69+
"os == 'linux' && debug",
70+
"os == 'linux' && asan",
71+
]
5072

5173
["browser_popupNotification_learnmore.js"]
52-
skip-if = ["(os == 'linux' && (debug || asan))"]
74+
skip-if = [
75+
"os == 'linux' && debug",
76+
"os == 'linux' && asan",
77+
]
5378

5479
["browser_popupNotification_no_anchors.js"]
5580
https_first_disabled = true
56-
skip-if = ["(os == 'linux' && (debug || asan))"]
81+
skip-if = [
82+
"os == 'linux' && debug",
83+
"os == 'linux' && asan",
84+
]
5785

5886
["browser_popupNotification_security_delay.js"]
5987

6088
["browser_popupNotification_selection_required.js"]
61-
skip-if = ["(os == 'linux' && (debug || asan))"]
89+
skip-if = [
90+
"os == 'linux' && debug",
91+
"os == 'linux' && asan",
92+
]
6293

6394
["browser_reshow_in_background.js"]
64-
skip-if = ["(os == 'linux' && (debug || asan))"]
95+
skip-if = [
96+
"os == 'linux' && debug",
97+
"os == 'linux' && asan",
98+
]

‎browser/base/content/test/popups/browser.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ support-files = [
1414
"popup_blocker_10_popups.html",
1515
]
1616
skip-if = [
17-
"(os == 'linux')", # Frequent bug 1081925 and bug 1125520 failures
17+
"os == 'linux'", # Frequent bug 1081925 and bug 1125520 failures
1818
"debug",
1919
]
2020

‎browser/base/content/test/tabdialogs/browser.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ support-files = ["loadDelayedReply.sjs"]
1010
skip-if = [
1111
"apple_silicon && !debug", # Bug 1786514
1212
"apple_catalina && !debug", # Bug 1786514
13-
"win10_2004 && !debug", # Bug 1786514
1413
]
1514
support-files = ["test_page.html"]
1615

‎browser/base/content/test/tabs/browser.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ support-files = [
238238
["browser_overflowScroll.js"]
239239
fail-if = ["a11y_checks"] # Bug 1854233 scrollbutton-down/up may not be focusable and/or labeled
240240
skip-if = [
241-
"win10_2004", # Bug 1775648
242241
"win11_2009", # Bug 1797751
243242
]
244243

‎browser/components/about/test/unit/xpcshell.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[DEFAULT]
2-
skip-if = ["toolkit == 'android'"] # bug 1730213
3-
head = '' # no value from INI
2+
skip-if = ["os == 'android'"] # bug 1730213
3+
head = ''
44
# make the firefox services (eg newtab-service) available to xpcshell
55
firefox-appdir = "browser"
66

‎browser/components/aboutlogins/tests/browser/browser.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ skip-if = [
1919
]
2020

2121
["browser_alertDismissedAfterChangingPassword.js"]
22-
skip-if = ["os == 'mac' && os_version == '10.15' && !debug"] # Bug 1684513
22+
skip-if = ["apple_catalina && !debug"] # Bug 1684513
2323

2424
["browser_breachAlertShowingForAddedLogin.js"]
2525

2626
["browser_confirmDeleteDialog.js"]
2727

2828
["browser_contextmenuFillLogins.js"]
29-
skip-if = ["win10_2004 && debug"] # Bug 1723573
3029

3130
["browser_copyToClipboardButton.js"]
3231

‎browser/components/aboutlogins/tests/unit/xpcshell.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[DEFAULT]
2-
skip-if = ["toolkit == 'android'"] # bug 1730213
2+
skip-if = ["os == 'android'"] # bug 1730213
33
head = "head.js"
44
firefox-appdir = "browser"
55

‎browser/components/attribution/test/browser/browser.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
support-files = ["head.js"]
33

44
["browser_AttributionCode_Mac_telemetry.js"]
5-
skip-if = ["toolkit != 'cocoa'"] # macOS only telemetry.
5+
run-if = ["os == 'mac'"] # macOS only telemetry.
66

77
["browser_AttributionCode_telemetry.js"]
88
# These tests only cover the attribution cache file - which only exists on
99
# Windows.
10-
skip-if = ["os != 'win'"]
10+
run-if = ["os == 'win'"]

‎browser/components/contextualidentity/test/browser/browser.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ skip-if = ["os == 'linux' && bits == 64 && !debug"] # Bug 1731442
2424
["browser_favicon.js"]
2525

2626
["browser_forgetAPI_EME_forgetThisSite.js"]
27-
skip-if = ["os == 'win' && processor == 'aarch64'"] # bug 1531927
2827

2928
["browser_forgetAPI_cookie_getCookiesWithOriginAttributes.js"]
3029

@@ -45,7 +44,6 @@ skip-if = [
4544
"verify && debug && os == 'linux'",
4645
"apple_silicon", # Disabled due to bleedover with other tests when run in regular suites; passes in "failures" jobs
4746
"os == 'linux' && socketprocess_networking",
48-
"win10_2004 && !debug",
4947
]
5048

5149
["browser_newtabButton.js"]

‎browser/components/customizableui/test/unit/xpcshell.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[DEFAULT]
2-
head = '' # no value from INI
3-
skip-if = ["toolkit == 'android'"] # bug 1730213
2+
head = ''
3+
skip-if = ["os == 'android'"] # bug 1730213
44
firefox-appdir = "browser"
55

66
["test_unified_extensions_migration.js"]

‎browser/components/doh/test/browser/browser.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ skip-if = ["socketprocess_networking"]
1515
["browser_providerSteering.js"]
1616

1717
["browser_remoteSettings_newProfile.js"]
18-
skip-if = ["os == 'win' && bits == 32"] # Bug 1713464
18+
skip-if = ["win11_2009 && bits == 32"] # Bug 1713464
1919

2020
["browser_remoteSettings_rollout.js"]
21-
skip-if = ["os == 'win' && bits == 32"] # Bug 1713464
21+
skip-if = ["win11_2009 && bits == 32"] # Bug 1713464
2222

2323
["browser_rollback.js"]
2424

‎browser/components/doh/test/unit/xpcshell.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[DEFAULT]
2-
skip-if = ["toolkit == 'android'"] # bug 1730213
2+
skip-if = ["os == 'android'"] # bug 1730213
33
head = "head.js"
44
firefox-appdir = "browser"
55
support-files = ["../../../../../netwerk/test/unit/http2-ca.pem"]

‎browser/components/downloads/test/browser/browser.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ support-files = ["test_spammy_page.html"]
4343

4444
["browser_downloads_panel_context_menu.js"]
4545
skip-if = [
46-
"os == 'win' && os_version == '10.0' && bits == 64 && !debug", # Bug 1719949
47-
"win10_2004 && bits == 32 && debug", # Bug 1727925
46+
"win10_2009 && bits == 64 && !debug", # Bug 1719949
4847
]
4948

5049
["browser_downloads_panel_ctrl_click.js"]

‎browser/components/downloads/test/unit/xpcshell.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[DEFAULT]
22
head = "head.js"
33
firefox-appdir = "browser"
4-
skip-if = ["toolkit == 'android'"] # bug 1730213
4+
skip-if = ["os == 'android'"] # bug 1730213
55

66
["test_DownloadLastDir_basics.js"]
77

‎browser/components/enterprisepolicies/tests/xpcshell/xpcshell.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[DEFAULT]
2-
skip-if = ["toolkit == 'android'"] # bug 1730213
2+
skip-if = ["os == 'android'"] # bug 1730213
33
firefox-appdir = "browser"
44
head = "head.js"
55
support-files = ["policytest_v0.1.xpi"]

‎browser/components/extensions/test/browser/browser.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ skip-if = [
245245
["browser_ext_incognito_views.js"]
246246
skip-if = [
247247
"apple_silicon && !fission", # Disabled due to bleedover with other tests when run in regular suites; passes in "failures" jobs
248-
"win10_2004 && bits == 32 && debug", # Bug 1727925
249248
]
250249

251250
["browser_ext_lastError.js"]
@@ -374,7 +373,7 @@ skip-if = ["os == 'linux' && swgl && fission && tsan"] # high frequency intermit
374373

375374
["browser_ext_port_disconnect_on_crash.js"]
376375
https_first_disabled = true
377-
skip-if = ["!crashreporter"]
376+
run-if = ["crashreporter"]
378377

379378
["browser_ext_port_disconnect_on_window_close.js"]
380379

@@ -484,7 +483,6 @@ https_first_disabled = true
484483
https_first_disabled = true
485484
skip-if = [
486485
"os == 'mac'", # Bug 1722607
487-
"win10_2004 && debug", # high frequency intermittent Bug 1722607
488486
"os == 'linux' && debug", #Bug 1722607
489487
]
490488

@@ -607,8 +605,6 @@ https_first_disabled = true
607605
["browser_ext_url_overrides_newtab.js"]
608606
skip-if = [
609607
"os == 'linux' && os_version == '18.04'", # Bug 1651261
610-
"win10_2004 && asan", # Bug 1723573
611-
"win10_2004 && debug", # Bug 1723573
612608
"win11_2009 && asan", # Bug 1797751
613609
"win11_2009 && debug", # Bug 1797751
614610
]

0 commit comments

Comments
 (0)