summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2021-01-04 22:02:29 +0100
committerMartin Stransky <stransky@redhat.com>2021-01-04 22:02:29 +0100
commit51b68afd6ab2ca6f3ad9f87191ade0ded60749de (patch)
treeec8c246c9bc431ae6ff79129071ab2d24eb0970e
parentMerge branch 'master' into f33 (diff)
parentEnabled tests (diff)
downloadlibrewolf-fedora-ff-51b68afd6ab2ca6f3ad9f87191ade0ded60749de.tar.gz
librewolf-fedora-ff-51b68afd6ab2ca6f3ad9f87191ade0ded60749de.tar.bz2
librewolf-fedora-ff-51b68afd6ab2ca6f3ad9f87191ade0ded60749de.zip
Merge branch 'master' into f33
-rw-r--r--firefox.spec7
-rwxr-xr-xrun-tests-x115
2 files changed, 7 insertions, 5 deletions
diff --git a/firefox.spec b/firefox.spec
index 1760ffa..3e403c2 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -3,7 +3,7 @@
%global debug_build 0
%global build_with_clang 0
%global build_with_asan 0
-%global run_firefox_tests 0
+%global run_firefox_tests 1
%global test_offscreen 1
%global test_on_wayland 0
%global create_debuginfo 1
@@ -131,7 +131,7 @@ ExcludeArch: s390x
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 84.0.1
-Release: 3%{?pre_tag}%{?dist}
+Release: 4%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -1002,6 +1002,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Mon Jan 4 2021 Martin Stransky <stransky@redhat.com> - 84.0.1-4
+- Enabled tests
+
* Mon Jan 4 2021 Martin Stransky <stransky@redhat.com> - 84.0.1-3
- Enabled armv7hl arch on rawhide
diff --git a/run-tests-x11 b/run-tests-x11
index 8ec51a5..3e06441 100755
--- a/run-tests-x11
+++ b/run-tests-x11
@@ -13,12 +13,10 @@ ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
-./mach xpcshell-test --sequential 2>&1 | cat - | tee $TEST_DIR/xpcshell
-./mach xpcshell-test --sequential --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
-
# Basic render testing
export TEST_PARAMS=""
export TEST_FLAVOUR=""
+xvfb-run -s "$X_PARAMS" -n 94 ./mach xpcshell-test $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell
xvfb-run -s "$X_PARAMS" -n 99 ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
xvfb-run -s "$X_PARAMS" -n 97 ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
xvfb-run -s "$X_PARAMS" -n 98 ./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
@@ -26,6 +24,7 @@ xvfb-run -s "$X_PARAMS" -n 98 ./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>
# WebRender testing
export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
export TEST_FLAVOUR="-wr"
+xvfb-run -s "$X_PARAMS" -n 93 ./mach xpcshell-test $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
xvfb-run -s "$X_PARAMS" -n 96 ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
xvfb-run -s "$X_PARAMS" -n 94 ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
xvfb-run -s "$X_PARAMS" -n 95 ./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
bgstack15