Run xpcshell tests sequentially

This commit is contained in:
Martin Stransky 2020-12-16 19:32:47 +01:00
parent 80e8837e16
commit 100e09ad23
6 changed files with 23 additions and 8 deletions

View File

@ -153,9 +153,10 @@ Source34: firefox-search-provider.ini
Source35: google-loc-api-key Source35: google-loc-api-key
Source37: mochitest-python.tar.gz Source37: mochitest-python.tar.gz
Source38: print_results Source38: print_results
Source39: print_subtest Source39: perrors
Source40: run-tests-x11 Source40: run-tests-x11
Source41: run-tests-wayland Source41: run-tests-wayland
Source42: psummary
# Build patches # Build patches
Patch3: mozilla-build-arm.patch Patch3: mozilla-build-arm.patch
@ -360,6 +361,7 @@ This package contains results of tests executed during build.
%files -n %{testsuite_pkg_name} %files -n %{testsuite_pkg_name}
/%{version}%-%{release}/test_results /%{version}%-%{release}/test_results
/%{version}%-%{release}/test_summary.txt /%{version}%-%{release}/test_summary.txt
/%{version}%-%{release}/failures-*
%endif %endif
#--------------------------------------------------------------------- #---------------------------------------------------------------------
@ -711,7 +713,7 @@ find-links=`pwd`/mochitest-python
no-index=true no-index=true
EOF EOF
tar xf %{SOURCE37} tar xf %{SOURCE37}
cp %{SOURCE40} %{SOURCE41} %{SOURCE38} %{SOURCE39} . cp %{SOURCE40} %{SOURCE41} %{SOURCE42} %{SOURCE38} %{SOURCE39} .
mkdir -p test_results mkdir -p test_results
%if %{test_on_wayland} %if %{test_on_wayland}
./run-tests-wayland ./run-tests-wayland
@ -856,6 +858,7 @@ sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" %{buildroot}/%{moz
%{__mkdir_p} %{buildroot}/%{version}%-%{release}/test_results %{__mkdir_p} %{buildroot}/%{version}%-%{release}/test_results
%{__cp} test_results/* %{buildroot}/%{version}%-%{release}/test_results %{__cp} test_results/* %{buildroot}/%{version}%-%{release}/test_results
%{__cp} test_summary.txt %{buildroot}/%{version}%-%{release}/ %{__cp} test_summary.txt %{buildroot}/%{version}%-%{release}/
%{__cp} failures-*txt %{buildroot}/%{version}%-%{release}/
%endif %endif
# Default # Default

9
perrors Executable file
View File

@ -0,0 +1,9 @@
#!/usr/bin/bash
# Print failed tests
TEST_DIR=$1
TEST_FLAVOUR=$2
grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR 2>&1 > failures-mochitest$TEST_FLAVOUR
grep --text " FAIL " $TEST_DIR/xpcshell$TEST_FLAVOUR 2>&1 > failures-xpcshell$TEST_FLAVOUR
grep --text "REFTEST TEST-UNEXPECTED-FAIL" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > failures-reftest$TEST_FLAVOUR

View File

@ -5,6 +5,9 @@ export TEST_DIR="test_results"
echo "Test results" echo "Test results"
echo "Basic compositor" echo "Basic compositor"
./print_subtest "test_results" "" ./psummary "test_results" ""
echo "WebRender" echo "WebRender"
./print_subtest "test_results" "-wr" ./psummary "test_results" "-wr"
./perrors "test_results" ""
./perrors "test_results" "-wr"

View File

@ -36,8 +36,8 @@ if [ $OFFSCREEN_TESTING -ne 0 ] ; then
done done
fi fi
./mach xpcshell-test 2>&1 | cat - | tee $TEST_DIR/xpcshell ./mach xpcshell-test --sequential 2>&1 | cat - | tee $TEST_DIR/xpcshell
./mach xpcshell-test --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr ./mach xpcshell-test --sequential --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
# Basic render testing # Basic render testing
export TEST_PARAMS="" export TEST_PARAMS=""

View File

@ -13,8 +13,8 @@ ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
./mach xpcshell-test 2>&1 | cat - | tee $TEST_DIR/xpcshell ./mach xpcshell-test --sequential 2>&1 | cat - | tee $TEST_DIR/xpcshell
./mach xpcshell-test --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr ./mach xpcshell-test --sequential --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
# Basic render testing # Basic render testing
export TEST_PARAMS="" export TEST_PARAMS=""