From 8f6c83fab61151cdafba2349b01552136749c803 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Fri, 20 Nov 2020 22:24:45 +0100
Subject: [PATCH] Fixed x11 tests

---
 run-tests | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/run-tests b/run-tests
index 9d897cc..e9f6322 100755
--- a/run-tests
+++ b/run-tests
@@ -4,7 +4,7 @@ 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"'
+export X_PARAMS="-screen 0 1600x1200x24"
 
 # Fix for system nss
 ln -s /usr/bin/certutil objdir/dist/bin/certutil
@@ -13,21 +13,21 @@ ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
 mkdir test_results
 
 # Basic render testing
-xvfb-run "$X_PARAMS" ./mach mochitest $TEST_PARAMS >& test_results/check-mochitest
+xvfb-run -s "$X_PARAMS" ./mach mochitest $TEST_PARAMS >& test_results/check-mochitest
+xvfb-run -s "$X_PARAMS" ./mach jstestbrowser $TEST_PARAMS >& test_results/check-jstestbrowser
+xvfb-run -s "$X_PARAMS" ./mach crashtest $TEST_PARAMS --run-tests-in-parallel >& test_results/check-crashtest
+xvfb-run -s "$X_PARAMS" ./mach marionette-test $TEST_PARAMS >& test_results/check-marionette-test
+xvfb-run -s "$X_PARAMS" ./mach reftest $TEST_PARAMS --run-tests-in-parallel >& test_results/check-reftest
 ./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
+xvfb-run -s "$X_PARAMS" ./mach mochitest $TEST_PARAMS >& test_results/check-mochitest-wr
+xvfb-run -s "$X_PARAMS" ./mach jstestbrowser $TEST_PARAMS >& test_results/check-jstestbrowser-wr
+xvfb-run -s "$X_PARAMS" ./mach crashtest $TEST_PARAMS --run-tests-in-parallel >& test_results/check-crashtest-wr
+xvfb-run -s "$X_PARAMS" ./mach marionette-test $TEST_PARAMS >& test_results/check-marionette-test-wr
+xvfb-run -s "$X_PARAMS" ./mach reftest $TEST_PARAMS --run-tests-in-parallel >& test_results/check-reftest-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