travis: rework "if test" blocks in the script section

Split the "if test" blocks so that we get more sensible output in case
of a failure.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>
(cherry picked from commit abcfea23ad)

.travis.yml

@@ -114,6 +114,8 @@ script:
         --disable-llvm-shared-libs
         ;
       make && make check;
-    elif test x$BUILD = xscons; then
+    fi
+
+  - if test "x$BUILD" = xscons; then
       scons llvm=1 && scons llvm=1 check;
     fi