Merge branch 'master' into f33

This commit is contained in:
Martin Stransky 2021-01-05 18:44:28 +01:00
commit c8c93a4f8d
3 changed files with 13 additions and 7 deletions

View File

@ -162,6 +162,7 @@ Source39: perrors
Source40: run-tests-x11 Source40: run-tests-x11
Source41: run-tests-wayland Source41: run-tests-wayland
Source42: psummary Source42: psummary
Source43: print_failures
# Build patches # Build patches
Patch3: mozilla-build-arm.patch Patch3: mozilla-build-arm.patch
@ -730,7 +731,7 @@ find-links=`pwd`/mochitest-python
no-index=true no-index=true
EOF EOF
tar xf %{SOURCE37} tar xf %{SOURCE37}
cp %{SOURCE40} %{SOURCE41} %{SOURCE42} %{SOURCE38} %{SOURCE39} . cp %{SOURCE40} %{SOURCE41} %{SOURCE42} %{SOURCE38} %{SOURCE39} %{SOURCE43} .
mkdir -p test_results mkdir -p test_results
%if %{test_on_wayland} %if %{test_on_wayland}
./run-tests-wayland || true ./run-tests-wayland || true
@ -738,6 +739,7 @@ mkdir -p test_results
./run-tests-x11 || true ./run-tests-x11 || true
%endif %endif
./print_results > test_summary.txt 2>&1 || true ./print_results > test_summary.txt 2>&1 || true
./print_failures || true
%endif %endif
#--------------------------------------------------------------------- #---------------------------------------------------------------------
@ -875,7 +877,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}/ %{__cp} failures-* %{buildroot}/%{version}%-%{release}/ || true
%endif %endif
# Default # Default

7
print_failures Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/bash
# Analyze and print test failures
export TEST_DIR="test_results"
./perrors $TEST_DIR ""
./perrors $TEST_DIR "-wr"

View File

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