Fixed tests on all platforms, enabled crash reporter
This commit is contained in:
Martin Stransky
parent
424613e943
commit
6cebbf0a2a
1
.gitignore
vendored
1
.gitignore
vendored
@ -435,3 +435,4 @@ firefox-3.6.4.source.tar.bz2
|
||||
/firefox-langpacks-83.0-20201116.tar.xz
|
||||
/firefox-testing.tar.gz
|
||||
/site-packages.tar.gz
|
||||
/mochitest-python.tar.gz
|
||||
|
||||
33
firefox.spec
33
firefox.spec
@ -3,33 +3,25 @@
|
||||
%global debug_build 0
|
||||
%global build_with_clang 0
|
||||
%global build_with_asan 0
|
||||
%if 0%{?fedora} >= 33
|
||||
%ifarch x86_64
|
||||
%global run_firefox_tests 1
|
||||
%endif
|
||||
%endif
|
||||
%global create_debuginfo 1
|
||||
%global system_nss 1
|
||||
|
||||
# There are still build problems on s390x, see
|
||||
# https://koji.fedoraproject.org/koji/taskinfo?taskID=55048351
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1897522
|
||||
ExcludeArch: s390x
|
||||
ExcludeArch: armv7hl
|
||||
ExcludeArch: aarch64
|
||||
#ExcludeArch: s390x
|
||||
#ExcludeArch: armv7hl
|
||||
#ExcludeArch: aarch64
|
||||
|
||||
%ifarch armv7hl
|
||||
%global create_debuginfo 0
|
||||
%endif
|
||||
|
||||
%global enable_mozilla_crashreporter 0
|
||||
# Temporary disable on rawhide due to
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1891794
|
||||
%if 0%{?fedora} < 33
|
||||
%ifarch x86_64 %{ix86}
|
||||
%global enable_mozilla_crashreporter 1
|
||||
%endif
|
||||
%endif
|
||||
%if %{build_with_asan}
|
||||
%global enable_mozilla_crashreporter 0
|
||||
%endif
|
||||
@ -129,7 +121,7 @@ ExcludeArch: aarch64
|
||||
Summary: Mozilla Firefox Web browser
|
||||
Name: firefox
|
||||
Version: 83.0
|
||||
Release: 14%{?pre_tag}%{?dist}
|
||||
Release: 15%{?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
|
||||
@ -154,7 +146,7 @@ Source32: node-stdout-nonblocking-wrapper
|
||||
Source33: firefox.appdata.xml.in
|
||||
Source34: firefox-search-provider.ini
|
||||
Source35: google-loc-api-key
|
||||
Source37: site-packages.tar.gz
|
||||
Source37: mochitest-python.tar.gz
|
||||
Source38: print_results
|
||||
Source39: print_subtest
|
||||
Source40: run-tests
|
||||
@ -187,6 +179,7 @@ Patch224: mozilla-1170092.patch
|
||||
Patch226: rhbz-1354671.patch
|
||||
Patch227: firefox-locale-debug.patch
|
||||
Patch228: disable-openh264-download.patch
|
||||
Patch229: firefox-mochitest.patch
|
||||
|
||||
# Upstream patches
|
||||
Patch402: mozilla-1196777.patch
|
||||
@ -408,6 +401,7 @@ This package contains results of tests executed during build.
|
||||
%endif
|
||||
%patch227 -p1 -b .locale-debug
|
||||
%patch228 -p1 -b .disable-openh264-download
|
||||
%patch229 -p1 -b .firefox-mochitest
|
||||
|
||||
%patch402 -p1 -b .1196777
|
||||
%patch407 -p1 -b .1667096
|
||||
@ -707,8 +701,15 @@ GDK_BACKEND=x11 xvfb-run ./mach build 2>&1 | cat -
|
||||
make -C objdir buildsymbols
|
||||
%endif
|
||||
|
||||
# run Firefox test suite
|
||||
%if 0%{?run_firefox_tests}
|
||||
tar xf %{SOURCE37} -C "objdir/_virtualenvs/init_py3/lib64/python3.9"
|
||||
mkdir -p objdir/_virtualenvs/init_py3
|
||||
%{__cat} > objdir/_virtualenvs/init_py3/pip.conf << EOF
|
||||
[global]
|
||||
find-links=`pwd`/mochitest-python
|
||||
no-index=true
|
||||
EOF
|
||||
tar xf %{SOURCE37}
|
||||
cp %{SOURCE40} %{SOURCE38} %{SOURCE39} .
|
||||
mkdir -p test_results
|
||||
./run-tests
|
||||
@ -995,6 +996,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Tue Dec 9 2020 Martin Stransky <stransky@redhat.com> - 83.0-15
|
||||
- Enabled tests everywhere
|
||||
- Enabled crash reporter
|
||||
|
||||
* Tue Dec 1 2020 Martin Stransky <stransky@redhat.com> - 83.0-14
|
||||
- Enabled LTO
|
||||
|
||||
|
||||
@ -9,18 +9,13 @@ MERR=`grep "TEST_END: Test ERROR" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
|
||||
MUNEX=`grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
|
||||
echo "Mochitest PASSED: $MPASS FAILED: $MERR UNEXPECTED-FAILURES: $MUNEX"
|
||||
|
||||
JSPASS=`grep --text "REFTEST INFO | Successful:" $TEST_DIR/jstestbrowser$TEST_FLAVOUR | cut -d ' ' -f 5`
|
||||
JSFAILS=`grep --text "REFTEST INFO | Unexpected:" $TEST_DIR/jstestbrowser$TEST_FLAVOUR | cut -d ' ' -f 5`
|
||||
JSKNOWN=`grep --text "REFTEST INFO | Known problems:" $TEST_DIR/jstestbrowser$TEST_FLAVOUR | cut -d ' ' -f 6`
|
||||
echo "JSBrowser PASSED: $JSPASS FAILED: $JSFAILS Known issues: $JSKNOWN"
|
||||
|
||||
MARPASS=`grep --text "Expected results:" $TEST_DIR/marionette$TEST_FLAVOUR | cut -d ' ' -f 3`
|
||||
MARSKIP=`grep --text "Skipped:" $TEST_DIR/marionette$TEST_FLAVOUR | cut -d ' ' -f 2`
|
||||
MARFAILED=`grep --text "Unexpected results:" $TEST_DIR/marionette$TEST_FLAVOUR | cut -d ' ' -f 3`
|
||||
echo "Marionette: PASSED: $MARPASS FAILED: $MARSKIP Known issues: $MARFAILED"
|
||||
|
||||
XPCPASS=`grep --text "INFO INFO | Passed:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 6`
|
||||
XPCFAIL=`grep --text "INFO INFO | Failed:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 6`
|
||||
XPCPASS=`grep --text "INFO INFO | Passed:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 7`
|
||||
XPCFAIL=`grep --text "INFO INFO | Failed:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 7`
|
||||
echo "XPCShell: PASSED: $XPCPASS FAILED: $XPCFAIL"
|
||||
|
||||
CRPASS=`grep "REFTEST INFO | Successful:" $TEST_DIR/crashtest$TEST_FLAVOUR | cut -d ' ' -f 5`
|
||||
@ -31,7 +26,3 @@ RFPASS=`grep --text "REFTEST INFO | Successful:" $TEST_DIR/reftest$TEST_FLAVOUR
|
||||
RFUN=`grep --text "^REFTEST INFO | Unexpected:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 5`
|
||||
RFKNOWN=`grep --text "REFTEST INFO | Known problems:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 6`
|
||||
echo "Reftest: PASSED: $RFPASS FAILED: $RFUN Known issues: $RFKNOWN"
|
||||
|
||||
GPASS=`grep "\[ PASSED \]" $TEST_DIR/gtest$TEST_FLAVOUR | cut -d ' ' -f 7`
|
||||
GFAIL=`grep "FAILED TESTS" $TEST_DIR/gtest$TEST_FLAVOUR | cut -d ' ' -f 2`
|
||||
echo "GTest: PASSED: "$GPASS" FAILED: "$GFAIL
|
||||
|
||||
@ -17,23 +17,19 @@ NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
|
||||
export TEST_PARAMS=""
|
||||
export TEST_FLAVOUR=""
|
||||
xvfb-run -s "$X_PARAMS" ./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS >& $TEST_DIR/mochitest$TEST_FLAVOUR
|
||||
xvfb-run -s "$X_PARAMS" ./mach jstestbrowser $TEST_PARAMS >& $TEST_DIR/jstestbrowser$TEST_FLAVOUR
|
||||
xvfb-run -s "$X_PARAMS" ./mach crashtest $TEST_PARAMS --run-tests-in-parallel >& $TEST_DIR/crashtest$TEST_FLAVOUR
|
||||
xvfb-run -s "$X_PARAMS" ./mach marionette-test $TEST_PARAMS >& $TEST_DIR/marionette$TEST_FLAVOUR
|
||||
xvfb-run -s "$X_PARAMS" ./mach reftest $TEST_PARAMS --run-tests-in-parallel >& $TEST_DIR/reftest$TEST_FLAVOUR
|
||||
./mach xpcshell-test $TEST_PARAMS 2>&1 | cat - > $TEST_DIR/xpcshell$TEST_FLAVOUR
|
||||
./mach gtest -j $NCPUS $TEST_PARAMS >& $TEST_DIR/gtest$TEST_FLAVOUR
|
||||
|
||||
# WebRender testing
|
||||
export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
|
||||
export TEST_FLAVOUR="-wr"
|
||||
xvfb-run -s "$X_PARAMS" ./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS >& $TEST_DIR/mochitest$TEST_FLAVOUR
|
||||
xvfb-run -s "$X_PARAMS" ./mach jstestbrowser $TEST_PARAMS >& $TEST_DIR/jstestbrowser$TEST_FLAVOUR
|
||||
xvfb-run -s "$X_PARAMS" ./mach crashtest $TEST_PARAMS --run-tests-in-parallel >& $TEST_DIR/crashtest$TEST_FLAVOUR
|
||||
xvfb-run -s "$X_PARAMS" ./mach marionette-test $TEST_PARAMS >& $TEST_DIR/marionette$TEST_FLAVOUR
|
||||
xvfb-run -s "$X_PARAMS" ./mach reftest $TEST_PARAMS --run-tests-in-parallel >& $TEST_DIR/reftest$TEST_FLAVOUR
|
||||
./mach xpcshell-test $TEST_PARAMS 2>&1 | cat - > $TEST_DIR/xpcshell$TEST_FLAVOUR
|
||||
./mach gtest -j $NCPUS $TEST_PARAMS >& $TEST_DIR/gtest$TEST_FLAVOUR
|
||||
|
||||
# Rest
|
||||
export TEST_DIR="test"
|
||||
|
||||
2
sources
2
sources
@ -1,4 +1,4 @@
|
||||
SHA512 (cbindgen-vendor.tar.xz) = 3c925c5523246b7dfbcb4ce563483d5b45315a06dc90f2cf07cddef0c263dd15b410afbbe4d86594de96a308e93be3b27ffec01f5f759a42ecba3cc983b1677f
|
||||
SHA512 (firefox-83.0.source.tar.xz) = 4ac49cefed278d1f898907bbedacf81ea4bb4e5784f567d4c0971d9cbc2cf4a2e4472de81a7ded620bc3a516bc972d600b516b7674319cdfc9734c3824a9a2f6
|
||||
SHA512 (firefox-langpacks-83.0-20201116.tar.xz) = 0d26660a7f09481e82d8d88ac43917001301d422a94dc48d3913dff92805f100221ca6db15fea05e895221efe5a9d74c07780a671aebc26a69d7a588e1cd423d
|
||||
SHA512 (site-packages.tar.gz) = cdeeb986a0fae736b5e1d6effce1decbb1d5365ea370ca7d88ae379b9a6bd41190f183a6aa934ef287272106f4a323eb8ea75bf9aae6388b7908047875882b85
|
||||
SHA512 (mochitest-python.tar.gz) = 7f357cb8bd93d64be5cb75819a8a813d2f8f217ff25f0df8c3190910744132405d45797b3900775a44b554f5c70cf2682809c9e7a686ca131fddcd81e98028d9
|
||||
|
||||
Loading…
Reference in New Issue
Block a user