From eda702a95211a18d2e247dd7dfff7029e707c2c0 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 2 Mar 2021 08:11:18 +0100
Subject: Log reftest results as HTML

---
 firefox.spec        |  5 +++--
 perrors             |  9 ---------
 print-error-reftest | 13 +++++++++++++
 print-errors        |  9 +++++++++
 print_failures      |  6 ++++--
 5 files changed, 29 insertions(+), 13 deletions(-)
 delete mode 100755 perrors
 create mode 100755 print-error-reftest
 create mode 100755 print-errors

diff --git a/firefox.spec b/firefox.spec
index c6ee5f7..857aa37 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -201,11 +201,12 @@ Source34:       firefox-search-provider.ini
 Source35:       google-loc-api-key
 Source37:       mochitest-python.tar.gz
 Source38:       print_results
-Source39:       perrors
+Source39:       print-errors
 Source40:       run-tests-x11
 Source41:       run-tests-wayland
 Source42:       psummary
 Source43:       print_failures
+Source44:       print-error-reftest
 
 # Build patches
 Patch3:         mozilla-build-arm.patch
@@ -792,7 +793,7 @@ find-links=`pwd`/mochitest-python
 no-index=true
 EOF
 tar xf %{SOURCE37}
-cp %{SOURCE40} %{SOURCE41} %{SOURCE42} %{SOURCE38} %{SOURCE39} %{SOURCE43} .
+cp %{SOURCE40} %{SOURCE41} %{SOURCE42} %{SOURCE38} %{SOURCE39} %{SOURCE43} %{SOURCE44} .
 mkdir -p test_results
 %if %{test_on_wayland}
 ./run-tests-wayland %{test_offscreen} || true
diff --git a/perrors b/perrors
deleted file mode 100755
index 537a4d0..0000000
--- a/perrors
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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
diff --git a/print-error-reftest b/print-error-reftest
new file mode 100755
index 0000000..7a58c1c
--- /dev/null
+++ b/print-error-reftest
@@ -0,0 +1,13 @@
+#!/usr/bin/bash
+# Print reftest failures and compose them to html
+
+TEST_DIR="$1"
+TEST_FLAVOUR="$2"
+OUTPUT_FILE="failures-reftest$TEST_FLAVOUR.html"
+
+grep --text -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" -e "IMAGE 1 (TEST):" -e "IMAGE 2 (REFERENCE):" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > $OUTPUT_FILE
+sed -i '/REFTEST   IMAGE 1/a ">' $OUTPUT_FILE
+sed -i '/REFTEST   IMAGE 2/a "><BR><BR>' $OUTPUT_FILE
+sed -i '/REFTEST TEST/a <BR>' $OUTPUT_FILE
+sed -i -e 's/^REFTEST   IMAGE 1 (TEST): /<img border=2 src="/' $OUTPUT_FILE
+sed -i -e 's/^REFTEST   IMAGE 2 (REFERENCE): /<img border=2 src="/' $OUTPUT_FILE
diff --git a/print-errors b/print-errors
new file mode 100755
index 0000000..b3ddba6
--- /dev/null
+++ b/print-errors
@@ -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 -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > failures-reftest$TEST_FLAVOUR
diff --git a/print_failures b/print_failures
index 3827601..e3b8b63 100755
--- a/print_failures
+++ b/print_failures
@@ -3,5 +3,7 @@
 
 export TEST_DIR="test_results"
 
-./perrors $TEST_DIR ""
-./perrors $TEST_DIR "-wr"
+./print-errors $TEST_DIR ""
+./print-errors $TEST_DIR "-wr"
+./print-error-reftest $TEST_DIR ""
+./print-error-reftest $TEST_DIR "-wr"
-- 
cgit