diff options
| author | Martin Stransky <stransky@redhat.com> | 2021-04-30 10:58:16 +0200 |
|---|---|---|
| committer | Martin Stransky <stransky@redhat.com> | 2021-04-30 10:58:16 +0200 |
| commit | 5571ee740329e2e0942db40af92e613a9d393153 (patch) | |
| tree | a7d88a879cf1faa52eca7a23561bdbf788d7ca1f | |
| parent | Test fix (diff) | |
| download | librewolf-fedora-ff-5571ee740329e2e0942db40af92e613a9d393153.tar.gz librewolf-fedora-ff-5571ee740329e2e0942db40af92e613a9d393153.tar.bz2 librewolf-fedora-ff-5571ee740329e2e0942db40af92e613a9d393153.zip | |
Fixed xpcshell freezes
| -rw-r--r-- | firefox-tests-xpcshell-freeze.patch | 14 | ||||
| -rw-r--r-- | firefox.spec | 7 | ||||
| -rwxr-xr-x | run-tests-wayland | 5 |
3 files changed, 19 insertions, 7 deletions
diff --git a/firefox-tests-xpcshell-freeze.patch b/firefox-tests-xpcshell-freeze.patch new file mode 100644 index 0000000..1115417 --- /dev/null +++ b/firefox-tests-xpcshell-freeze.patch @@ -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): diff --git a/firefox.spec b/firefox.spec index 7bc4eb8..f321553 100644 --- a/firefox.spec +++ b/firefox.spec @@ -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 diff --git a/run-tests-wayland b/run-tests-wayland index 8efff7e..4a3ebda 100755 --- a/run-tests-wayland +++ b/run-tests-wayland @@ -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 |