From e8dd3240a42e4b1c96ce0d1d22735c8401b24770 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 5 Jan 2021 15:28:24 +0100
Subject: Don't fail on tests

---
 firefox.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index b98ac6f..5bfe964 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -873,9 +873,9 @@ sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" %{buildroot}/%{moz
 
 %if 0%{?run_firefox_tests}
 %{__mkdir_p} %{buildroot}/%{version}%-%{release}/test_results
-%{__cp} test_results/* %{buildroot}/%{version}%-%{release}/test_results
-%{__cp} test_summary.txt %{buildroot}/%{version}%-%{release}/
-%{__cp} failures-*txt %{buildroot}/%{version}%-%{release}/
+%{__cp} test_results/* %{buildroot}/%{version}%-%{release}/test_results || true
+%{__cp} test_summary.txt %{buildroot}/%{version}%-%{release}/ || true
+%{__cp} failures-*txt %{buildroot}/%{version}%-%{release}/ || true
 %endif
 
 # Default
-- 
cgit 


From bc34c2ba1765a325d2326c13c697e67896998118 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 5 Jan 2021 15:40:59 +0100
Subject: Fix missing test_failures.txt file

---
 firefox.spec   | 13 ++++++++-----
 print_failures |  8 ++++++++
 print_results  |  7 ++-----
 3 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100755 print_failures

diff --git a/firefox.spec b/firefox.spec
index 5bfe964..8f52b77 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -162,6 +162,7 @@ Source39:       perrors
 Source40:       run-tests-x11
 Source41:       run-tests-wayland
 Source42:       psummary
+Source43:       print_failures
 
 # Build patches
 Patch3:         mozilla-build-arm.patch
@@ -368,7 +369,7 @@ This package contains results of tests executed during build.
 %files -n %{testsuite_pkg_name}
 /%{version}%-%{release}/test_results
 /%{version}%-%{release}/test_summary.txt
-/%{version}%-%{release}/failures-*
+/%{version}%-%{release}/test_failures.txt
 %endif
 
 #---------------------------------------------------------------------
@@ -730,7 +731,7 @@ find-links=`pwd`/mochitest-python
 no-index=true
 EOF
 tar xf %{SOURCE37}
-cp %{SOURCE40} %{SOURCE41} %{SOURCE42} %{SOURCE38} %{SOURCE39} .
+cp %{SOURCE40} %{SOURCE41} %{SOURCE42} %{SOURCE38} %{SOURCE39} %{SOURCE43} .
 mkdir -p test_results
 %if %{test_on_wayland}
 ./run-tests-wayland || true
@@ -738,6 +739,8 @@ mkdir -p test_results
 ./run-tests-x11 || true
 %endif
 ./print_results > test_summary.txt 2>&1 || true
+./print_failures >> test_summary.txt 2>&1 || true
+./print_failures > test_failures.txt 2>&1 || true
 %endif
 
 #---------------------------------------------------------------------
@@ -873,9 +876,9 @@ sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" %{buildroot}/%{moz
 
 %if 0%{?run_firefox_tests}
 %{__mkdir_p} %{buildroot}/%{version}%-%{release}/test_results
-%{__cp} test_results/* %{buildroot}/%{version}%-%{release}/test_results || true
-%{__cp} test_summary.txt %{buildroot}/%{version}%-%{release}/ || true
-%{__cp} failures-*txt %{buildroot}/%{version}%-%{release}/ || true
+%{__cp} test_results/* %{buildroot}/%{version}%-%{release}/test_results
+%{__cp} test_summary.txt %{buildroot}/%{version}%-%{release}/
+%{__cp} test_failures.txt %{buildroot}/%{version}%-%{release}/
 %endif
 
 # Default
diff --git a/print_failures b/print_failures
new file mode 100755
index 0000000..202474d
--- /dev/null
+++ b/print_failures
@@ -0,0 +1,8 @@
+#!/usr/bin/bash
+# Analyze and print test failures
+
+export TEST_DIR="test_results"
+
+echo "Test failures"
+./perrors $TEST_DIR ""
+./perrors $TEST_DIR "-wr"
diff --git a/print_results b/print_results
index 0656e5f..183ad71 100755
--- a/print_results
+++ b/print_results
@@ -5,9 +5,6 @@ export TEST_DIR="test_results"
 
 echo "Test results"
 echo "Basic compositor"
-./psummary "test_results" ""
+./psummary $TEST_DIR ""
 echo "WebRender"
-./psummary "test_results" "-wr"
-
-./perrors "test_results" ""
-./perrors "test_results" "-wr"
+./psummary $TEST_DIR "-wr"
-- 
cgit 


From f31d3e52b363cd519bbac756b55a2702b4c871ee Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 5 Jan 2021 18:44:12 +0100
Subject: test tweaks

---
 firefox.spec   | 7 +++----
 print_failures | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index 8f52b77..2a7a7d6 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -369,7 +369,7 @@ This package contains results of tests executed during build.
 %files -n %{testsuite_pkg_name}
 /%{version}%-%{release}/test_results
 /%{version}%-%{release}/test_summary.txt
-/%{version}%-%{release}/test_failures.txt
+/%{version}%-%{release}/failures-*
 %endif
 
 #---------------------------------------------------------------------
@@ -739,8 +739,7 @@ mkdir -p test_results
 ./run-tests-x11 || true
 %endif
 ./print_results > test_summary.txt 2>&1 || true
-./print_failures >> test_summary.txt 2>&1 || true
-./print_failures > test_failures.txt 2>&1 || true
+./print_failures || true
 %endif
 
 #---------------------------------------------------------------------
@@ -878,7 +877,7 @@ sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" %{buildroot}/%{moz
 %{__mkdir_p} %{buildroot}/%{version}%-%{release}/test_results
 %{__cp} test_results/* %{buildroot}/%{version}%-%{release}/test_results
 %{__cp} test_summary.txt %{buildroot}/%{version}%-%{release}/
-%{__cp} test_failures.txt %{buildroot}/%{version}%-%{release}/
+%{__cp} failures-* %{buildroot}/%{version}%-%{release}/ || true
 %endif
 
 # Default
diff --git a/print_failures b/print_failures
index 202474d..3827601 100755
--- a/print_failures
+++ b/print_failures
@@ -3,6 +3,5 @@
 
 export TEST_DIR="test_results"
 
-echo "Test failures"
 ./perrors $TEST_DIR ""
 ./perrors $TEST_DIR "-wr"
-- 
cgit