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

---
 run-tests | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

(limited to 'run-tests')

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