Fix mochitest
This commit is contained in:
Martin Stransky
parent
378e1130a2
commit
4b86827d56
|
|
@ -433,3 +433,4 @@ firefox-3.6.4.source.tar.bz2
|
|||
/firefox-83.0.source.tar.xz
|
||||
/firefox-langpacks-83.0-20201112.tar.xz
|
||||
/firefox-langpacks-83.0-20201116.tar.xz
|
||||
/firefox-testing.tar.gz
|
||||
|
|
|
|||
17
firefox.spec
17
firefox.spec
|
|
@ -125,7 +125,7 @@ ExcludeArch: aarch64
|
|||
Summary: Mozilla Firefox Web browser
|
||||
Name: firefox
|
||||
Version: 83.0
|
||||
Release: 5%{?pre_tag}%{?dist}
|
||||
Release: 6%{?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
|
||||
|
|
@ -150,9 +150,7 @@ Source32: node-stdout-nonblocking-wrapper
|
|||
Source33: firefox.appdata.xml.in
|
||||
Source34: firefox-search-provider.ini
|
||||
Source35: google-loc-api-key
|
||||
Source36: run-tests
|
||||
Source37: print_results_general
|
||||
Source38: print_results_spec
|
||||
Source36: firefox-testing.tar.gz
|
||||
|
||||
# Build patches
|
||||
Patch3: mozilla-build-arm.patch
|
||||
|
|
@ -706,9 +704,11 @@ make -C objdir buildsymbols
|
|||
%endif
|
||||
|
||||
%if 0%{?run_firefox_tests}
|
||||
cp %{SOURCE36} .
|
||||
cp %{SOURCE37} .
|
||||
cp %{SOURCE38} .
|
||||
tar xf %{SOURCE36}
|
||||
cat > objdir/_virtualenvs/init_py3/pip.conf << EOF
|
||||
[install]
|
||||
find-links=`pwd`/mochitest-python
|
||||
EOF
|
||||
./run-tests
|
||||
%endif
|
||||
#---------------------------------------------------------------------
|
||||
|
|
@ -996,6 +996,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||
#---------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Tue Nov 24 2020 Martin Stransky <stransky@redhat.com> - 83.0-6
|
||||
- Fix mochitest
|
||||
|
||||
* Wed Nov 18 2020 Martin Stransky <stransky@redhat.com> - 83.0-5
|
||||
- Build with tests enabled
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
#!/usr/bin/bash
|
||||
# Analyze and print general test results
|
||||
|
||||
TEST_DIR="test_general"
|
||||
|
||||
echo "Cppunittests:"
|
||||
grep "cppunittests INFO | Passed:" $TEST_DIR/cppunittest
|
||||
grep "cppunittests INFO | Failed:" $TEST_DIR/cppunittest
|
||||
echo " "
|
||||
|
||||
echo "JSAPI test:"
|
||||
echo -n "PASSED: "
|
||||
grep "TEST-PASS" $TEST_DIR/jsapi | wc -l
|
||||
echo " "
|
||||
|
||||
echo "JStests test:"
|
||||
tail -n 1 $TEST_DIR/jstests
|
||||
echo " "
|
||||
|
||||
echo "Rust tests"
|
||||
grep "test result:" $TEST_DIR/rusttests
|
||||
echo " "
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
#!/usr/bin/bash
|
||||
# Analyze and print specialized (basic/webrender) test results
|
||||
|
||||
TEST_DIR=$1
|
||||
|
||||
echo "Mochitest:"
|
||||
echo -n "PASSED: "
|
||||
grep "TEST_END: Test OK" $TEST_DIR/mochitest | wc -l
|
||||
echo -n "FAILED: "
|
||||
grep "TEST_END: Test ERROR" $TEST_DIR/mochitest | wc -l
|
||||
echo -n "UNEXPECTED-FAILURES: "
|
||||
grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest | wc -l
|
||||
echo " "
|
||||
|
||||
echo "JS Test Browser:"
|
||||
grep --text "REFTEST INFO | Successful:" $TEST_DIR/jstestbrowser
|
||||
grep --text "REFTEST INFO | Unexpected:" $TEST_DIR/jstestbrowser
|
||||
grep --text "REFTEST INFO | Known problems:" $TEST_DIR/jstestbrowser
|
||||
echo " "
|
||||
|
||||
echo "Marionette:"
|
||||
grep --text "Expected results:" $TEST_DIR/marionette
|
||||
grep --text "Skipped:" $TEST_DIR/marionette
|
||||
grep --text "Unexpected results:" $TEST_DIR/marionette
|
||||
echo " "
|
||||
|
||||
echo "XPCShell:"
|
||||
grep --text "INFO INFO | Passed:" $TEST_DIR/xpcshell
|
||||
grep --text "INFO INFO | Failed:" $TEST_DIR/xpcshell
|
||||
echo " "
|
||||
|
||||
echo "Crash test:"
|
||||
grep "REFTEST INFO | Successful:" $TEST_DIR/crashtest
|
||||
grep "REFTEST INFO | Unexpected:" $TEST_DIR/crashtest
|
||||
echo " "
|
||||
|
||||
echo "Reftest:"
|
||||
grep --text "REFTEST INFO | Successful:" $TEST_DIR/reftest
|
||||
grep --text "REFTEST INFO | Unexpected:" $TEST_DIR/reftest
|
||||
grep --text "REFTEST INFO | Known problems:" $TEST_DIR/reftest
|
||||
echo " "
|
||||
|
||||
echo "GTest:"
|
||||
grep "\[ PASSED \]" $TEST_DIR/gtest
|
||||
grep "FAILED TESTS" $TEST_DIR/gtest
|
||||
echo " "
|
||||
58
run-tests
58
run-tests
|
|
@ -1,58 +0,0 @@
|
|||
#!/usr/bin/bash
|
||||
set -x
|
||||
|
||||
export MACH_USE_SYSTEM_PYTHON=1
|
||||
export MOZ_NODE_PATH=/usr/bin/node
|
||||
export TEST_PARAMS=""
|
||||
export X_PARAMS="-screen 0 1600x1200x24"
|
||||
export TEST_SUMMARY="test_summary.txt"
|
||||
|
||||
# Fix for system nss
|
||||
ln -s /usr/bin/certutil objdir/dist/bin/certutil
|
||||
ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
|
||||
|
||||
mkdir test_general
|
||||
mkdir test_basic
|
||||
mkdir test_wr
|
||||
|
||||
NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
|
||||
|
||||
# Basic render testing
|
||||
export TEST_DIR="test_basic"
|
||||
xvfb-run -s "$X_PARAMS" ./mach mochitest $TEST_PARAMS >& $TEST_DIR/mochitest
|
||||
xvfb-run -s "$X_PARAMS" ./mach jstestbrowser $TEST_PARAMS >& $TEST_DIR/jstestbrowser
|
||||
xvfb-run -s "$X_PARAMS" ./mach crashtest $TEST_PARAMS --run-tests-in-parallel >& $TEST_DIR/crashtest
|
||||
xvfb-run -s "$X_PARAMS" ./mach marionette-test $TEST_PARAMS >& $TEST_DIR/marionette
|
||||
xvfb-run -s "$X_PARAMS" ./mach reftest $TEST_PARAMS --run-tests-in-parallel >& $TEST_DIR/reftest
|
||||
./mach xpcshell-test $TEST_PARAMS 2>&1 | cat - > $TEST_DIR/xpcshell
|
||||
./mach gtest -j $NCPUS $TEST_PARAMS >& $TEST_DIR/gtest
|
||||
|
||||
# WebRender testing
|
||||
TEST_PARAMS="--enable-webrender $TEST_PARAMS"
|
||||
export TEST_DIR="test_wr"
|
||||
xvfb-run -s "$X_PARAMS" ./mach mochitest $TEST_PARAMS >& $TEST_DIR/mochitest
|
||||
xvfb-run -s "$X_PARAMS" ./mach jstestbrowser $TEST_PARAMS >& $TEST_DIR/jstestbrowser
|
||||
xvfb-run -s "$X_PARAMS" ./mach crashtest $TEST_PARAMS --run-tests-in-parallel >& $TEST_DIR/crashtest
|
||||
xvfb-run -s "$X_PARAMS" ./mach marionette-test $TEST_PARAMS >& $TEST_DIR/marionette
|
||||
xvfb-run -s "$X_PARAMS" ./mach reftest $TEST_PARAMS --run-tests-in-parallel >& $TEST_DIR/reftest
|
||||
./mach xpcshell-test $TEST_PARAMS 2>&1 | cat - > $TEST_DIR/xpcshell
|
||||
./mach gtest -j $NCPUS $TEST_PARAMS >& $TEST_DIR/gtest
|
||||
|
||||
# Rest
|
||||
export TEST_DIR="test_general"
|
||||
objdir/dist/bin/jsapi-tests >& $TEST_DIR/jsapi
|
||||
./mach cppunittest >& $TEST_DIR/cppunittest
|
||||
./mach rusttests >& $TEST_DIR/rusttests
|
||||
./mach jstests >& $TEST_DIR/jstests
|
||||
|
||||
echo "Test results" > $TEST_SUMMARY
|
||||
echo "" >> $TEST_SUMMARY
|
||||
echo "Basic test results" >> $TEST_SUMMARY
|
||||
./print_results_spec test_basic >> $TEST_SUMMARY
|
||||
echo "WR test results" >> $TEST_SUMMARY
|
||||
./print_results_spec test_wr >> $TEST_SUMMARY
|
||||
echo "General test results" >> $TEST_SUMMARY
|
||||
./print_results_general >> $TEST_SUMMARY
|
||||
|
||||
rm -f objdir/dist/bin/certutil
|
||||
rm -f objdir/dist/bin/pk12util
|
||||
1
sources
1
sources
|
|
@ -1,3 +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 (firefox-testing.tar.gz) = 2adda701576ee10b76e623d31f8b73d8ca3008c62dfb5942f77b29f84397bb4ebe42075d9c332f0ae4a115c85933bfaa0b4da03aaa8624cfae561721e03ffaad
|
||||
|
|
|
|||
Loading…
Reference in New Issue