[gjs: 4/5] CI: avoid paralelism so xvfb run properly

[Philip Chimento <pchimento src gnome org>]

commit b14c086f6c972770412f532129a4b1d7b7b24e07
Author: Claudio André <claudioandre br gmail com>
Date:   Sat Mar 24 22:02:55 2018 -0300

    CI: avoid paralelism so xvfb run properly
    
    [skip eslint]

 .gitlab-ci.yml  |  3 +++
 test/test-ci.sh | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d15a9cd..3673434 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,6 +63,7 @@ fedora:
   variables:
     CC: gcc
     DEV: devel
+    TEST: "check"
 
 ubuntu_gcc:
   <<: *build
@@ -115,6 +116,7 @@ sanitizer_gcc:
   variables:
     CC: gcc
     DEV: devel
+    TEST: "check"
     BUILD_OPTS: "--enable-asan --enable-ubsan"
 
 sanitizer_clang:
@@ -124,6 +126,7 @@ sanitizer_clang:
   variables:
     CC: clang
     DEV: devel
+    TEST: "check"
     BUILD_OPTS: "--enable-asan --enable-ubsan"
 
 codequality:
diff --git a/test/test-ci.sh b/test/test-ci.sh
index 3979383..0238d1c 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -149,12 +149,12 @@ if [[ $1 == "GJS" ]]; then
         echo "Autogen options: $ci_autogenargs"
         eval ./autogen.sh "$ci_autogenargs"
 
-        if [[ $TEST == "build" ]]; then
-            make -sj
-        elif [[ $TEST == "distcheck" ]]; then
-            make -sj distcheck
-        else
-            make -sj check
+        make -sj
+
+        if [[ $TEST == "distcheck" ]]; then
+            make -s distcheck
+        elif [[ $TEST == "check" ]]; then
+            make -s check
         fi
         make -sj install
     fi
@@ -167,9 +167,9 @@ elif [[ $1 == "GJS_EXTRA" ]]; then
     PATH=$PATH:~/.local/bin
 
     if [[ "$DEV" != "devel" ]]; then
-        xvfb-run jhbuild run dbus-run-session -- gnome-desktop-testing-runner gjs
+        xvfb-run -a --server-args="-screen 0 1024x768x24" jhbuild run dbus-run-session -- 
gnome-desktop-testing-runner gjs
     else
-        xvfb-run dbus-run-session -- gnome-desktop-testing-runner gjs
+        xvfb-run -a --server-args="-screen 0 1024x768x24" dbus-run-session -- gnome-desktop-testing-runner 
gjs
     fi
 
 elif [[ $1 == "GJS_COVERAGE" ]]; then