[gjs: 1/5] CI: small tweaks

[Philip Chimento <pchimento src gnome org>]

commit 2b9ffae24ddba33852a4b969ed69eadd957d6c2d
Author: Claudio André <claudioandre br gmail com>
Date:   Sat Mar 24 20:38:01 2018 -0300

    CI: small tweaks

 .gitlab-ci.yml  | 13 +++++++------
 test/test-ci.sh | 10 +++++++---
 2 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f102423..b5ef27a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,12 +29,13 @@ stages:
 
   script:
     # CI starts here. Previous messages are GitLab Runner setup.
-    - echo
-    - echo "*********************************************"
-    - echo "***     JavaScript bindings for GNOME     ***"
-    - echo "***        Continuous Integration         ***"
-    - echo "*********************************************"
-    - echo
+    - 'echo;
+       echo "*********************************************";
+       echo "***     JavaScript bindings for GNOME     ***";
+       echo "***        Continuous Integration         ***";
+       echo "*********************************************";
+       echo;
+    '
 
     # Run static code analysis OR
     # Build dependencies and 'make' gjs
diff --git a/test/test-ci.sh b/test/test-ci.sh
index 44291f5..3979383 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -9,6 +9,13 @@ function do_Set_Env(){
     XDG_CACHE_HOME="$(pwd)"/.cache
     export XDG_CACHE_HOME
 
+    #SpiderMonkey
+    export PKG_CONFIG_PATH=/root/jhbuild/install/lib/pkgconfig
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/root/jhbuild/install/lib
+
+    #Macros
+    export ACLOCAL_PATH=$ACLOCAL_PATH:/root/jhbuild/install/share/aclocal
+
     export JHBUILD_RUN_AS_ROOT=1
     export SHELL=/bin/bash
     PATH=$PATH:~/.local/bin
@@ -136,9 +143,6 @@ if [[ $1 == "GJS" ]]; then
 
         jhbuild make --check
     else
-        # Ignore JHBuild "chroot" and do a system wide (regular) setup
-        export PKG_CONFIG_PATH=/root/jhbuild/install/lib/pkgconfig
-        export LD_LIBRARY_PATH=/root/jhbuild/install/lib
         export AM_DISTCHECK_CONFIGURE_FLAGS="--enable-compile-warnings=error --with-xvfb-tests"
 
         # Regular (autotools only) build