Merge branch 'master' into f33

This commit is contained in:
Martin Stransky 2021-01-04 22:02:29 +01:00
commit 51b68afd6a
2 changed files with 7 additions and 5 deletions

View File

@ -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

View File

@ -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