[gjs: 1/2] CI: treat warnings as errors

[Philip Chimento <pchimento src gnome org>]

commit d0cabd1e42b6c45f50db5d31aea5a6f0361d0079
Author: Claudio André <claudioandre br gmail com>
Date:   Sun Feb 4 19:05:11 2018 -0200

    CI: treat warnings as errors
    
    CI was not treating wasning as errors due to JHBuild configuration.
    This solves this situation. See also #117.
    
    [ci skip]

 test/extra/do_jhbuild.sh | 17 ++++++++++++++++-
 test/test-ci.sh          |  8 +++++---
 2 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/test/extra/do_jhbuild.sh b/test/extra/do_jhbuild.sh
index 56129c1e..0ce07c03 100755
--- a/test/extra/do_jhbuild.sh
+++ b/test/extra/do_jhbuild.sh
@@ -33,6 +33,20 @@ function do_Configure_JHBuild(){
     echo
     echo '-- Set JHBuild Configuration --'
 
+    mkdir -p ~/.config
+
+    cat <<EOFILE > ~/.config/jhbuildrc
+skip = ['gettext', 'yelp-xsl', 'yelp-tools', 'gtk-doc']
+use_local_modulesets = True
+EOFILE
+
+    echo '-- Done --'
+}
+
+function do_Configure_MainBuild(){
+    echo
+    echo '-- Set Main JHBuild Configuration --'
+
     mkdir -p ~/.config
     autogenargs="--enable-compile-warnings=error --with-xvfb-tests"
 
@@ -40,11 +54,12 @@ function do_Configure_JHBuild(){
         autogenargs="$autogenargs $BUILD_OPTS"
     fi
 
-    cat <<EOFILE >> ~/.config/jhbuildrc
+    cat <<EOFILE > ~/.config/jhbuildrc
 module_autogenargs['gjs'] = "$autogenargs"
 module_makeargs['gjs'] = '-s'
 skip = ['gettext', 'yelp-xsl', 'yelp-tools', 'gtk-doc']
 use_local_modulesets = True
+disable_Werror = False
 EOFILE
 
     echo '-- Done --'
diff --git a/test/test-ci.sh b/test/test-ci.sh
index 6ed9ad25..0d63f577 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -71,10 +71,12 @@ if [[ $1 == "GJS" ]]; then
     if [[ $2 != "devel" ]]; then
         do_Build_Package_Dependencies gjs
     else
-      jhbuild build m4-common
-      mkdir -p ~/jhbuild/checkout/gjs
-      do_Install_Extras
+        jhbuild build m4-common
+
+        mkdir -p ~/jhbuild/checkout/gjs
+        do_Install_Extras
     fi
+    do_Configure_MainBuild
 
     # Build and test the latest commit (merged or from a merge/pull request) of
     # Javascript Bindings for GNOME (gjs)