Merge branch 'f33' into rawhide

1 files changed, 14 insertions, 11 deletions

diff --git a/firefox-tests-xpcshell.patch b/firefox-tests-xpcshell.patch
index 26089d7..f3f419f 100644
--- a/firefox-tests-xpcshell.patch
+++ b/firefox-tests-xpcshell.patch
@@ -1,23 +1,23 @@
 diff -U0 firefox-86.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini
 --- firefox-86.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 14:43:35.000000000 +0100
-+++ firefox-86.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini	2021-03-02 08:58:37.587763298 +0100
++++ firefox-86.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini	2021-03-02 15:21:43.002449859 +0100
 @@ -9 +8,0 @@
 -[test_appupdateurl.js]
 @@ -27 +25,0 @@
 -[test_sorted_alphabetically.js]
 diff -U0 firefox-86.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini
 --- firefox-86.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 14:43:36.000000000 +0100
-+++ firefox-86.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini	2021-03-02 08:55:53.081679862 +0100
++++ firefox-86.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini	2021-03-02 15:21:43.002449859 +0100
 @@ -9 +8,0 @@
 -[test_adb.js]
 diff -U0 firefox-86.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/netwerk/test/unit_ipc/xpcshell.ini
 --- firefox-86.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 15:19:41.000000000 +0100
-+++ firefox-86.0/netwerk/test/unit_ipc/xpcshell.ini	2021-03-02 08:55:53.081679862 +0100
++++ firefox-86.0/netwerk/test/unit_ipc/xpcshell.ini	2021-03-02 15:21:43.002449859 +0100
 @@ -73 +72,0 @@
 -[test_dns_service_wrap.js]
 diff -U0 firefox-86.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/netwerk/test/unit/xpcshell.ini
 --- firefox-86.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 15:47:05.000000000 +0100
-+++ firefox-86.0/netwerk/test/unit/xpcshell.ini	2021-03-02 09:00:04.738928807 +0100
++++ firefox-86.0/netwerk/test/unit/xpcshell.ini	2021-03-02 15:21:43.002449859 +0100
 @@ -203 +202,0 @@
 -[test_dns_service.js]
 @@ -227 +225,0 @@
@@ -35,22 +35,25 @@ diff -U0 firefox-86.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell fire
 -[test_httpssvc_retry_with_ech.js]
 diff -U0 firefox-86.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/security/manager/ssl/tests/unit/xpcshell.ini
 --- firefox-86.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 15:47:05.000000000 +0100
-+++ firefox-86.0/security/manager/ssl/tests/unit/xpcshell.ini	2021-03-02 08:55:53.082679887 +0100
-@@ -182 +181,0 @@
++++ firefox-86.0/security/manager/ssl/tests/unit/xpcshell.ini	2021-03-02 19:20:41.609012711 +0100
+@@ -115,2 +114,0 @@
+-[test_encrypted_client_hello.js]
+-run-sequentially = hardcoded ports
+@@ -182 +179,0 @@
 -[test_oskeystore.js]
 diff -U0 firefox-86.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell firefox-86.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
 --- firefox-86.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell	2021-02-22 14:43:46.000000000 +0100
-+++ firefox-86.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini	2021-03-02 08:55:53.082679887 +0100
++++ firefox-86.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini	2021-03-02 15:21:43.003449884 +0100
 @@ -10 +9,0 @@
 -[test_pkcs11_module.js]
 diff -U0 firefox-86.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/toolkit/components/commandlines/test/unit/xpcshell.ini
 --- firefox-86.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 14:43:53.000000000 +0100
-+++ firefox-86.0/toolkit/components/commandlines/test/unit/xpcshell.ini	2021-03-02 08:55:53.082679887 +0100
++++ firefox-86.0/toolkit/components/commandlines/test/unit/xpcshell.ini	2021-03-02 15:21:43.003449884 +0100
 @@ -10 +9,0 @@
 -[test_resolvefile.js]
 diff -U0 firefox-86.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell firefox-86.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
 --- firefox-86.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell	2021-02-22 15:47:05.000000000 +0100
-+++ firefox-86.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini	2021-03-02 08:55:53.082679887 +0100
++++ firefox-86.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini	2021-03-02 15:21:43.003449884 +0100
 @@ -79,2 +78,0 @@
 -[test_ext_downloads_misc.js]
 -skip-if = os == "android" || (os=='linux' && bits==32) || tsan # linux32: bug 1324870, tsan: bug 1612707
@@ -59,11 +62,11 @@ diff -U0 firefox-86.0/toolkit/components/extensions/test/xpcshell/xpcshell-commo
 -skip-if = appname == "thunderbird"
 diff -U0 firefox-86.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
 --- firefox-86.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 14:43:54.000000000 +0100
-+++ firefox-86.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini	2021-03-02 08:55:53.082679887 +0100
++++ firefox-86.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini	2021-03-02 15:21:43.003449884 +0100
 @@ -10 +9,0 @@
 -[test_subprocess.js]
 diff -U0 firefox-86.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
 --- firefox-86.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 14:43:54.000000000 +0100
-+++ firefox-86.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-03-02 08:55:53.082679887 +0100
++++ firefox-86.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-03-02 15:21:43.003449884 +0100
 @@ -97 +96,0 @@
 -[test_sideloads_after_rebuild.js]