[gjs: 1/4] CI: indicates when JHBuild is used

[Philip Chimento <pchimento src gnome org>]

commit 3f2a6c0b23c694c23bec243c6f517b2987ded381
Author: Claudio André <claudioandre br gmail com>
Date:   Sat Jun 9 09:55:34 2018 -0300

    CI: indicates when JHBuild is used
    
    The default build is via autogen. JHBuild is only used in special
    situations.

 .gitlab-ci.yml  | 16 ++--------------
 test/test-ci.sh |  6 +++---
 2 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43bf4171..c968155c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,6 @@ fedora:
   image: claudioandre/spidermonkey:job-456.7  # pinned on purpose
   variables:
     CC: gcc
-    DEV: devel
     TEST: "check"
     WARNINGS: "count"
 
@@ -93,7 +92,6 @@ ubuntu_gcc:
   image: claudioandre/spidermonkey:ubuntu.dev.gcc
   variables:
     CC: gcc
-    DEV: devel
     TEST: "distcheck"
   only:
     - master@GNOME/gjs
@@ -104,7 +102,6 @@ ubuntu_clang:
   image: claudioandre/spidermonkey:ubuntu.dev.gcc
   variables:
     CC: clang
-    DEV: devel
     TEST: "distcheck"
   only:
     - master@GNOME/gjs
@@ -115,7 +112,6 @@ fedora_clang:
   image: claudioandre/spidermonkey:new-342.4  # temporarily pinned to old tag
   variables:
     CC: clang
-    DEV: devel
     TEST: "distcheck"
 
 no_profiler:
@@ -124,7 +120,6 @@ no_profiler:
   image: claudioandre/spidermonkey:fedora.dev.gcc
   variables:
     CC: gcc
-    DEV: devel
     TEST: "check"
     BUILD_OPTS: "--disable-profiler"
 
@@ -134,7 +129,6 @@ installed_tests:
   image: claudioandre/spidermonkey:ubuntu.dev.gcc
   variables:
     CC: clang
-    DEV: devel
     BUILD_OPTS: "--enable-installed-tests --prefix=/usr"
 
 coverage:
@@ -143,6 +137,7 @@ coverage:
   image: claudioandre/spidermonkey:fedora.27.gcc
   variables:
     CC: gcc
+    DEV: jhbuild
     BUILD_OPTS: "--enable-code-coverage"
     coverage: '/^Lines:.\d+.\d+.(\d+\.\d+\%)/'
   except:
@@ -154,7 +149,6 @@ sanitizer_gcc:
   image: claudioandre/spidermonkey:fedora.dev.gcc
   variables:
     CC: gcc
-    DEV: devel
     TEST: "check"
     BUILD_OPTS: "--enable-asan --enable-ubsan"
 
@@ -167,7 +161,6 @@ with_logging:
   image: claudioandre/spidermonkey:fedora.dev.gcc
   variables:
     CC: gcc
-    DEV: devel
     BUILD_OPTS: CPPFLAGS='-DGJS_VERBOSE_ENABLE_PROPS=1 -DGJS_VERBOSE_ENABLE_MARSHAL=1 
-DGJS_VERBOSE_ENABLE_LIFECYCLE=1 -DGJS_VERBOSE_ENABLE_GI_USAGE=1 -DGJS_VERBOSE_ENABLE_CLOSURE=1 
-DGJS_VERBOSE_ENABLE_GSIGNAL=1'
 
 sanitizer_clang:
@@ -176,7 +169,6 @@ sanitizer_clang:
   image: claudioandre/spidermonkey:new-342.4  # temporarily pinned to old tag
   variables:
     CC: clang
-    DEV: devel
     TEST: "check"
     BUILD_OPTS: "--enable-asan --enable-ubsan"
   only:
@@ -254,7 +246,6 @@ valgrind:
   image: claudioandre/spidermonkey:fedora.dev.gcc
   variables:
     CC: gcc
-    DEV: devel
     BUILD_OPTS: "--enable-valgrind --disable-valgrind-helgrind --prefix=/usr"
   allow_failure: true
   when: manual
@@ -265,7 +256,6 @@ no_graphics:
   image: claudioandre/spidermonkey:fedora.dev.gcc
   variables:
     CC: gcc
-    DEV: devel
     TEST: "check"
     BUILD_OPTS: "--without-cairo --without-gtk"
   when: manual
@@ -276,6 +266,7 @@ lts:
   image: claudioandre/spidermonkey:ubuntu.lts.gcc
   variables:
     CC: gcc
+    DEV: jhbuild
     TEST: "check"
   when: manual
 
@@ -307,7 +298,6 @@ zeal_2:
   image: claudioandre/spidermonkey:fedora.debug.gcc
   variables:
     CC: gcc
-    DEV: devel
     TEST: "check"
     JS_GC_ZEAL: 2
   when: manual
@@ -318,7 +308,6 @@ zeal_4:
   image: claudioandre/spidermonkey:fedora.debug.gcc
   variables:
     CC: gcc
-    DEV: devel
     TEST: "check"
     JS_GC_ZEAL: 4
   when: manual
@@ -329,7 +318,6 @@ zeal_11:
   image: claudioandre/spidermonkey:fedora.debug.gcc
   variables:
     CC: gcc
-    DEV: devel
     TEST: "check"
     JS_GC_ZEAL: 11
   when: manual
diff --git a/test/test-ci.sh b/test/test-ci.sh
index 45184602..e663ce0a 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -143,7 +143,7 @@ if [[ $1 == "GJS" ]]; then
     do_Set_Env
     do_Show_Info
 
-    if [[ "$DEV" != "devel" ]]; then
+    if [[ "$DEV" == "jhbuild" ]]; then
         do_Get_JHBuild
         do_Build_JHBuild
         do_Configure_JHBuild
@@ -161,7 +161,7 @@ if [[ $1 == "GJS" ]]; then
 
     do_Print_Labels 'Do the GJS build'
 
-    if [[ "$DEV" != "devel" ]]; then
+    if [[ "$DEV" == "jhbuild" ]]; then
         cp -r ./ ~/jhbuild/checkout/gjs
         cd ~/jhbuild/checkout/gjs
 
@@ -194,7 +194,7 @@ elif [[ $1 == "GJS_EXTRA" ]]; then
     do_Print_Labels 'Run GJS installed tests'
     do_Set_Env
 
-    if [[ "$DEV" != "devel" ]]; then
+    if [[ "$DEV" == "jhbuild" ]]; then
         xvfb-run -a --server-args="-screen 0 1024x768x24" jhbuild run dbus-run-session -- 
gnome-desktop-testing-runner gjs
     else
         xvfb-run -a --server-args="-screen 0 1024x768x24" dbus-run-session -- gnome-desktop-testing-runner 
gjs