From b1cadbebbf1f362b37815e00ab4b0149987d8585 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 7 Sep 2021 15:33:17 +0200 Subject: Build fixes --- firefox-tests-xpcshell.patch | 11 ----------- firefox.spec | 5 ++--- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/firefox-tests-xpcshell.patch b/firefox-tests-xpcshell.patch index 9c7b08d..a342668 100644 --- a/firefox-tests-xpcshell.patch +++ b/firefox-tests-xpcshell.patch @@ -5,17 +5,6 @@ diff -U0 firefox-92.0/browser/components/enterprisepolicies/tests/xpcshell/xpcsh -[test_appupdateurl.js] @@ -27 +25,0 @@ -[test_sorted_alphabetically.js] -diff -U0 firefox-92.0/browser/extensions/formautofill/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/browser/extensions/formautofill/test/unit/xpcshell.ini ---- firefox-92.0/browser/extensions/formautofill/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:14:34.000000000 +0200 -+++ firefox-92.0/browser/extensions/formautofill/test/unit/xpcshell.ini 2021-09-03 18:41:07.754088004 +0200 -@@ -79,0 +80,2 @@ -+skip-if = tsan # Times out, bug 1612707 -+[test_sync.js] -diff -U0 firefox-92.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini ---- firefox-92.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:14:34.000000000 +0200 -+++ firefox-92.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini 2021-09-03 18:41:07.754088004 +0200 -@@ -9 +8,0 @@ --[test_adb.js] diff -U0 firefox-92.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/netwerk/test/unit_ipc/xpcshell.ini --- firefox-92.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:15:11.000000000 +0200 +++ firefox-92.0/netwerk/test/unit_ipc/xpcshell.ini 2021-09-03 18:41:07.754088004 +0200 diff --git a/firefox.spec b/firefox.spec index 079c16b..7088404 100644 --- a/firefox.spec +++ b/firefox.spec @@ -737,13 +737,12 @@ cp %{SOURCE45} . env | grep "WAYLAND" MOZ_ENABLE_WAYLAND=1 ./mach build -v 2>&1 | cat - %else -xvfb-run ./mach build -v 2>&1 | cat - +xvfb-run ./mach build -v 2>&1 | cat - %endif %else -./mach build -v 2>&1 | cat - +./mach build -v 2>&1 | cat - %endif - #--------------------------------------------------------------------- %install # run Firefox test suite -- cgit