Fixed xpcshell freezes

This commit is contained in:
Martin Stransky 2021-04-30 10:58:16 +02:00
parent 4d8fcd73a4
commit 5571ee7403
3 changed files with 19 additions and 7 deletions

View File

@ -0,0 +1,14 @@
diff -up firefox-88.0/testing/xpcshell/runxpcshelltests.py.old firefox-88.0/testing/xpcshell/runxpcshelltests.py
--- firefox-88.0/testing/xpcshell/runxpcshelltests.py.old 2021-04-30 10:45:14.466616224 +0200
+++ firefox-88.0/testing/xpcshell/runxpcshelltests.py 2021-04-30 10:45:21.339525085 +0200
@@ -1382,8 +1382,8 @@ class XPCShellTests(object):
self.log.info("Process %s" % label)
self.log.info(msg)
- dumpOutput(proc.stdout, "stdout")
- dumpOutput(proc.stderr, "stderr")
+ #dumpOutput(proc.stdout, "stdout")
+ #dumpOutput(proc.stderr, "stderr")
self.nodeProc = {}
def startHttp3Server(self):

View File

@ -27,11 +27,6 @@
# https://bugzilla.redhat.com/show_bug.cgi?id=1897522
ExcludeArch: s390x
# Exclude ARM due to
# https://bugzilla.redhat.com/show_bug.cgi?id=1922599
# https://bugzilla.redhat.com/show_bug.cgi?id=1942516
ExcludeArch: armv7hl
%ifarch armv7hl
%global create_debuginfo 0
%endif
@ -213,6 +208,7 @@ Patch58: firefox-crashreporter-build.patch
# GENDIFF_DIFF_ARGS=-U0 gendiff firefox-xxxx .firefox-tests-reftest
Patch100: firefox-tests-xpcshell.patch
Patch101: firefox-tests-reftest.patch
Patch102: firefox-tests-xpcshell-freeze.patch
# Fedora specific patches
Patch215: firefox-enable-addons.patch
@ -451,6 +447,7 @@ This package contains results of tests executed during build.
# Test patches
%patch100 -p1 -b .firefox-tests-xpcshell
%patch101 -p1 -b .firefox-tests-reftest
%patch102 -p1 -b .firefox-tests-xpcshell-freeze
# Fedora patches
%patch215 -p1 -b .addons

View File

@ -22,8 +22,9 @@ while (( "$#" )); do
shift
done
MACH_USE_SYSTEM_PYTHON=1
MOZ_NODE_PATH=/usr/bin/node
export MACH_USE_SYSTEM_PYTHON=1
export MOZ_NODE_PATH=/usr/bin/node
MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4"
TEST_DIR="test_results"
mkdir $TEST_DIR