From b0b941cd529cda08fcbdb76f716e3970f67ff635 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 22 Dec 2020 07:24:42 +0100
Subject: [PATCH] dd

---
 firefox.spec      |  7 ++++--
 run-tests-wayland | 57 ++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index 6ca48eb..b2338e0 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -3,7 +3,7 @@
 %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 test_offscreen    1
 %global test_on_wayland   0
 %global create_debuginfo  1
@@ -135,7 +135,7 @@ ExcludeArch: s390x
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        84.0
-Release:        6%{?pre_tag}%{?dist}
+Release:        7%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -1003,6 +1003,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Dec 17 2020 Martin Stransky <stransky@redhat.com> - 84.0-7
+- Enabled tests
+
 * Thu Dec 17 2020 Martin Stransky <stransky@redhat.com> - 84.0-6
 - Disable PGO on Rawhide due to build issues
 - Disable system nss on Rawhide due to rhbz#1908018
diff --git a/run-tests-wayland b/run-tests-wayland
index 36d874d..eb42785 100755
--- a/run-tests-wayland
+++ b/run-tests-wayland
@@ -1,11 +1,44 @@
 #!/usr/bin/bash
+# usage: run-tests-wayland offscreen [test flavour]
+if ! [ $1 ] ; then
+  echo "Missing test params!"
+  echo ""
+  echo "usage: run-tests-wayland offscreen [test_flavour]"
+  echo ""
+  echo "       offscreen         can be 0 or 1"
+  echo "       test_flavour      can be xpc ref moch crash"
+  exit
+fi
+
 set -x
 OFFSCREEN_TESTING=$1
 
+RUN_XPCSHELL_TEST=0
+RUN_REFTEST=0
+RUN_MOCHITEST=0
+RUN_CRASHTEST=0
+
+SELECTED_TEST=$2
+if [ $SELECTED_TEST = "xpc" ] ; then
+  RUN_XPCSHELL_TEST=1
+elif [ $SELECTED_TEST = "ref" ] ; then
+  RUN_REFTEST=1
+elif [ $SELECTED_TEST = "moch" ] ; then
+  RUN_MOCHITEST=1
+elif [ $SELECTED_TEST = "crash" ] ; then
+  RUN_CRASHTEST=1
+else
+  RUN_XPCSHELL_TEST=1
+  RUN_REFTEST=1
+  RUN_MOCHITEST=1
+  RUN_CRASHTEST=1
+fi
+
 MACH_USE_SYSTEM_PYTHON=1
 MOZ_NODE_PATH=/usr/bin/node
 MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4"
 TEST_DIR="test_results"
+mkdir $TEST_DIR
 
 # Fix for system nss
 ln -s /usr/bin/certutil objdir/dist/bin/certutil
@@ -36,22 +69,36 @@ if [ $OFFSCREEN_TESTING -ne 0 ] ; then
   done
 fi
 
-./mach xpcshell-test --sequential 2>&1 | cat - | tee $TEST_DIR/xpcshell
-./mach xpcshell-test --sequential --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
+if [ $RUN_XPCSHELL_TEST -ne 0 ] ; then
+  ./mach xpcshell-test --sequential 2>&1 | cat - | tee $TEST_DIR/xpcshell
+  ./mach xpcshell-test --sequential --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
+fi
 
 # Basic render testing
 export TEST_PARAMS=""
 export TEST_FLAVOUR=""
-./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
-./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
-./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+if [ $RUN_REFTEST -ne 0 ] ; then
+  ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
+fi
+if [ $RUN_CRASHTEST -ne 0 ] ; then
+  ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
+fi
+if [ $RUN_MOCHITEST -ne 0 ] ; then
+  ./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+fi
 
 # WebRender testing
 export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
 export TEST_FLAVOUR="-wr"
+if [ $RUN_REFTEST -ne 0 ] ; then
 ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
+fi
+if [ $RUN_CRASHTEST -ne 0 ] ; then
 ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
+fi
+if [ $RUN_MOCHITEST -ne 0 ] ; then
 ./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+fi
 
 rm -f  objdir/dist/bin/certutil
 rm -f  objdir/dist/bin/pk12util