From 0c7ca0f53b5a0edc9d71f2801e5ec419d7fcdb0c Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Fri, 20 Nov 2020 12:27:58 +0100
Subject: Build with tests enabled

---
 firefox.spec | 14 +++++++-------
 run-tests    | 40 +++++++++++++++++++++++++++-------------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index 8841543..82423e8 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,9 +1,9 @@
 # Set to true if it's going to be submitted as update.
-%global release_build     1
+%global release_build     0
 %global debug_build       0
 %global build_with_clang  0
 %global build_with_asan   0
-%global run_firefox_tests 0
+%global run_firefox_tests 1
 %global create_debuginfo  1
 %global system_nss        1
 
@@ -11,8 +11,8 @@
 # https://koji.fedoraproject.org/koji/taskinfo?taskID=55048351
 # https://bugzilla.redhat.com/show_bug.cgi?id=1897522
 ExcludeArch: s390x
-#ExcludeArch: armv7hl
-#ExcludeArch: aarch64
+ExcludeArch: armv7hl
+ExcludeArch: aarch64
 
 %ifarch armv7hl
 %global create_debuginfo  0
@@ -525,7 +525,7 @@ chmod a-x third_party/rust/ash/src/extensions/khr/*.rs
 
 %build
 # Disable LTO to work around rhbz#1883904
-# %define _lto_cflags %{nil}
+%define _lto_cflags %{nil}
 
 %if 0%{?use_bundled_cbindgen}
 
@@ -641,7 +641,7 @@ echo "ac_add_options MOZ_PGO=1" >> .mozconfig
 # Fixed by https://bugzilla.mozilla.org/show_bug.cgi?id=1671345
 # Should be in Firefox 83
 # Temporary disabled due to https://bugzilla.redhat.com/show_bug.cgi?id=1893474
-echo "ac_add_options --enable-lto" >> .mozconfig
+# echo "ac_add_options --enable-lto" >> .mozconfig
 
 # PGO build doesn't work with ccache
 export CCACHE_DISABLE=1
@@ -980,7 +980,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
 * Wed Nov 18 2020 Martin Stransky <stransky@redhat.com> - 83.0-5
-- Enabled LTO
+- Build with tests enabled
 
 * Wed Nov 18 2020 Martin Stransky <stransky@redhat.com> - 83.0-4
 - Enable all arches
diff --git a/run-tests b/run-tests
index c008fa0..9d897cc 100755
--- a/run-tests
+++ b/run-tests
@@ -2,25 +2,39 @@
 set -x
 
 export MACH_USE_SYSTEM_PYTHON=1
+export MOZ_NODE_PATH=/usr/bin/node
+export TEST_PARAMS=""
+export X_PARAMS='-s "-screen 0 1600x1200x24"'
 
 # 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
-objdir/dist/bin/jsapi-tests >& test_results/check-jsapi || true
-./mach cppunittest >& test_results/check-cppunittest || true
-./mach gtest >& test_results/check-gtest || true
-./mach rusttests >& test_results/check-rusttests || true
-./mach jstests >& test_results/check-jstests || true
-# this test fails to quit
-#xvfb-run ./mach xpcshell-test >& test_results/check-xpcshell-test || true
-xvfb-run ./mach jstestbrowser >& test_results/check-jstestbrowser || true
-xvfb-run ./mach crashtest >& test_results/check-crashtest || true
-xvfb-run ./mach marionette-test >& test_results/check-marionette-test || true
-xvfb-run ./mach reftest --run-tests-in-parallel >& test_results/check-reftest || true
-xvfb-run ./mach mochitest --quiet >& test_results/check-mochitest || true
+
+# Basic render testing
+xvfb-run "$X_PARAMS" ./mach mochitest $TEST_PARAMS >& test_results/check-mochitest
+./mach xpcshell-test $TEST_PARAMS 2>&1 | cat - > test_results/check-xpcshell-test
+xvfb-run "$X_PARAMS" ./mach jstestbrowser $TEST_PARAMS >& test_results/check-jstestbrowser
+xvfb-run "$X_PARAMS" ./mach crashtest $TEST_PARAMS --run-tests-in-parallel >& test_results/check-crashtest
+xvfb-run "$X_PARAMS" ./mach marionette-test $TEST_PARAMS >& test_results/check-marionette-test
+xvfb-run "$X_PARAMS" ./mach reftest $TEST_PARAMS --run-tests-in-parallel >& test_results/check-reftest
+
+# WebRender testing
+TEST_PARAMS="--enable-webrender $TEST_PARAMS"
+xvfb-run "$X_PARAMS" ./mach mochitest $TEST_PARAMS >& test_results/check-mochitest-wr
+./mach xpcshell-test $TEST_PARAMS 2>&1 | cat - > test_results/check-xpcshell-test-wr
+xvfb-run "$X_PARAMS" ./mach jstestbrowser $TEST_PARAMS >& test_results/check-jstestbrowser-wr
+xvfb-run "$X_PARAMS" ./mach crashtest $TEST_PARAMS --run-tests-in-parallel >& test_results/check-crashtest-wr
+xvfb-run "$X_PARAMS" ./mach marionette-test $TEST_PARAMS >& test_results/check-marionette-test-wr
+xvfb-run "$X_PARAMS" ./mach reftest $TEST_PARAMS --run-tests-in-parallel >& test_results/check-reftest-wr
+
+# 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
 
 rm -f  objdir/dist/bin/certutil
 rm -f  objdir/dist/bin/pk12util
-
-- 
cgit