From 5e4620df5a7ae37bc1dc49138cc0ecb982876d74 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 23 Nov 2020 18:49:00 +0100 Subject: [PATCH] Updated tests --- firefox.spec | 19 ++++++++++++++---- run-tests | 54 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 51 insertions(+), 22 deletions(-) diff --git a/firefox.spec b/firefox.spec index 00d586f..0b50c90 100644 --- a/firefox.spec +++ b/firefox.spec @@ -151,6 +151,8 @@ 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 # Build patches Patch3: mozilla-build-arm.patch @@ -359,7 +361,10 @@ Summary: Results of testsuite %description -n %{testsuite_pkg_name} This package contains results of tests executed during build. %files -n %{testsuite_pkg_name} -/test_results +/test_general +/test_basic +/test_wr +/test_summary.txt %endif #--------------------------------------------------------------------- @@ -702,6 +707,8 @@ make -C objdir buildsymbols %if 0%{?run_firefox_tests} cp %{SOURCE36} . +cp %{SOURCE37} . +cp %{SOURCE38} . ./run-tests %endif #--------------------------------------------------------------------- @@ -847,9 +854,13 @@ sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" %{buildroot}/%{moz %endif %if 0%{?run_firefox_tests} -# Add debuginfo for crash-stats.mozilla.com -%{__mkdir_p} %{buildroot}/test_results -%{__cp} test_results/* %{buildroot}/test_results +%{__mkdir_p} %{buildroot}/test_general +%{__mkdir_p} %{buildroot}/test_basic +%{__mkdir_p} %{buildroot}/test_wr +%{__cp} test_general/* %{buildroot}/test_general +%{__cp} test_basic/* %{buildroot}/test_basic +%{__cp} test_wr/* %{buildroot}/test_wr +%{__cp} test_summary.txt %{buildroot}/ %endif # Default diff --git a/run-tests b/run-tests index e9f6322..cf9eabf 100755 --- a/run-tests +++ b/run-tests @@ -5,36 +5,54 @@ 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_results +mkdir test_general +mkdir test_basic +mkdir test_wr + +NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" # Basic render testing -xvfb-run -s "$X_PARAMS" ./mach mochitest $TEST_PARAMS >& test_results/check-mochitest -xvfb-run -s "$X_PARAMS" ./mach jstestbrowser $TEST_PARAMS >& test_results/check-jstestbrowser -xvfb-run -s "$X_PARAMS" ./mach crashtest $TEST_PARAMS --run-tests-in-parallel >& test_results/check-crashtest -xvfb-run -s "$X_PARAMS" ./mach marionette-test $TEST_PARAMS >& test_results/check-marionette-test -xvfb-run -s "$X_PARAMS" ./mach reftest $TEST_PARAMS --run-tests-in-parallel >& test_results/check-reftest -./mach xpcshell-test $TEST_PARAMS 2>&1 | cat - > test_results/check-xpcshell-test +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" -xvfb-run -s "$X_PARAMS" ./mach mochitest $TEST_PARAMS >& test_results/check-mochitest-wr -xvfb-run -s "$X_PARAMS" ./mach jstestbrowser $TEST_PARAMS >& test_results/check-jstestbrowser-wr -xvfb-run -s "$X_PARAMS" ./mach crashtest $TEST_PARAMS --run-tests-in-parallel >& test_results/check-crashtest-wr -xvfb-run -s "$X_PARAMS" ./mach marionette-test $TEST_PARAMS >& test_results/check-marionette-test-wr -xvfb-run -s "$X_PARAMS" ./mach reftest $TEST_PARAMS --run-tests-in-parallel >& test_results/check-reftest-wr -./mach xpcshell-test $TEST_PARAMS 2>&1 | cat - > test_results/check-xpcshell-test-wr +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 -objdir/dist/bin/jsapi-tests >& test_results/check-jsapi -./mach cppunittest >& test_results/check-cppunittest -./mach gtest >& test_results/check-gtest -./mach rusttests >& test_results/check-rusttests -./mach jstests >& test_results/check-jstests +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