CI: fix the build on Travis

- Make the Travis scripts a bit more verbose on failure
 - Fix wrong filename tested for picking up the configuration
   (this is why the builds were failing: missing the force-webkit
   flag, while webengine isn't in the dockerfile for Travis)

FIXES #1018

ci/travis-continuous.sh

@@ -3,12 +3,12 @@
 # Travis CI script for use on every-commit:
 #  - build and install Calamares
 #
-test -n "$BUILDDIR" || exit 1
-test -n "$SRCDIR" || exit 1
+test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; }
+test -n "$SRCDIR" || { echo "! \$SRCDIR not set" ; exit 1 ; }
 
-test -d $BUILDDIR || exit 1
-test -d $SRCDIR || exit 1
-test -f $SRCDIR/CMakeLists.txt || exit 1
+test -d $BUILDDIR || { echo "! $BUILDDIR not a directory" ; exit 1 ; }
+test -d $SRCDIR || { echo "! $SRCDIR not a directory" ; exit 1 ; }
+test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; }
 
 cd $BUILDDIR || exit 1
 

ci/travis-coverity.sh

@@ -3,13 +3,13 @@
 # Travis CI script for weekly (cron) use:
 #  - use the coverity tool to build and and upload results
 #
-test -n "$COVERITY_SCAN_TOKEN" || exit 1
-test -n "$BUILDDIR" || exit 1
-test -n "$SRCDIR" || exit 1
+test -n "$COVERITY_SCAN_TOKEN" || { echo "! Missing Coverity token" ; exit 1 ; }
+test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; }
+test -n "$SRCDIR" || { echo "! \$SRCDIR not set" ; exit 1 ; }
 
-test -d $BUILDDIR || exit 1
-test -d $SRCDIR || exit 1
-test -f $SRCDIR/CMakeLists.txt || exit 1
+test -d $BUILDDIR || { echo "! $BUILDDIR not a directory" ; exit 1 ; }
+test -d $SRCDIR || { echo "! $SRCDIR not a directory" ; exit 1 ; }
+test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; }
 
 cd $BUILDDIR || exit 1
 
@@ -20,7 +20,6 @@ mkdir "$BUILDDIR/coveritytool"
 tar xvf coverity_tool.tar.gz -C "$BUILDDIR/coveritytool" --strip-components 2
 export PATH="$BUILDDIR/coveritytool/bin:$PATH"
 
-
 cmake -DCMAKE_BUILD_TYPE=Debug $CMAKE_ARGS $SRCDIR || exit 1
 cov-build --dir cov-int make -j2
 

ci/travis.sh

@@ -8,11 +8,11 @@
 #    intensive than the coverity add-on, but works on master.
 #
 D=`dirname "$0"`
-test -d "$D" || exit 1
-test -x "$D/travis-continuous.sh" || exit 1
-test -x "$D/travis-coverity.sh" || exit 1
+test -d "$D" || { echo "! No directory $D" ; exit 1 ; }
+test -x "$D/travis-continuous.sh" || { echo "! Missing -continuous" ; exit 1 ; }
+test -x "$D/travis-coverity.sh" || { echo "! Missing -coverity" ; exit 1 ; }
 
-test -f "$D/travis-common.sh" && . "$D/travis-config.sh"
+test -f "$D/travis-config.sh" && . "$D/travis-config.sh"
 
 if test "$TRAVIS_EVENT_TYPE" = "cron" ; then
   exec "$D/travis-coverity.sh"