From 564e8987b9f0752b9d74265fd4fc25f0e7d82c9b Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@osg.samsung.com>
Date: Fri, 5 Jan 2018 16:24:43 +0100
Subject: [PATCH] travis: add misc and wayland build options to build matrix

---
 .ci/ci-linux-build.sh | 35 +++++++++++++++++++++++++++++------
 .travis.yml           |  4 +++-
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/.ci/ci-linux-build.sh b/.ci/ci-linux-build.sh
index 5472495b5a..a48d0788a1 100755
--- a/.ci/ci-linux-build.sh
+++ b/.ci/ci-linux-build.sh
@@ -1,10 +1,33 @@
 #!/bin/sh
 
-COPTS="--with-tests=regular"
 PARALLEL_JOBS=10
 
-# Normal build test of all targets
-./autogen.sh $COPTS $@
-make -j $PARALLEL_JOBS
-make -j $PARALLEL_JOBS examples
-make -j $PARALLEL_JOBS benchmark
+CI_BUILD_TYPE=$1
+
+DEFAULT_COPTS="--with-tests=regular"
+WAYLAND_COPTS="--with-tests=regular --enable-wayland --enable-elput --enable-drm"
+MISC_COPTS="--enable-harfbuzz --enable-liblz4 --enable-image-loader-webp --enable-xinput22 --enable-multisense --enable-lua-old --enable-xpresent --enable-hyphen"
+
+# --enable-libvlc --enable-vnc-server --enable-g-main-loop --enable-libuv --enable-fb --enable-eglfs --enable-sdl --enable-gl-drm --enable-egl --enable-pix    man --enable-tile-rotate --enable-ecore-buffer --enable-image-loader-generic --enable-image-loader-jp2k --enable-gesture --enable-v4l2 --enable-xine
+# --with-profile=PROFILE --with-crypto=CRYPTO
+
+if [ "$CI_BUILD_TYPE" = "" ]; then
+  # Normal build test of all targets
+  ./autogen.sh $DEFAULT_COPTS
+  make -j $PARALLEL_JOBS
+  make -j $PARALLEL_JOBS examples
+  make -j $PARALLEL_JOBS benchmark
+fi
+
+if [ "$CI_BUILD_TYPE" = "wayland" ]; then
+  ./autogen.sh $WAYLAND_COPTS
+  make -j $PARALLEL_JOBS
+  make -j $PARALLEL_JOBS examples
+fi
+
+if [ "$CI_BUILD_TYPE" = "misc" ]; then
+  ./autogen.sh $MISC_COPTS
+  make -j $PARALLEL_JOBS
+  make -j $PARALLEL_JOBS examples
+fi
+
diff --git a/.travis.yml b/.travis.yml
index fff307fa3c..27140574e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,8 @@ matrix:
   include:
     - env: DISTRO=Ubuntu1710
     - env: DISTRO=Fedora27
+    - env: DISTRO=Fedora27 CI_BUILD_TYPE=wayland
+    - env: DISTRO=Fedora27 CI_BUILD_TYPE=misc
     - env: DISTRO=Debian91
     - env: DISTRO=Archlinux
     - os: osx
@@ -31,7 +33,7 @@ before_script:
 script:
   - |
       if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then
-        docker run -v `pwd`:/src -w /src stefanschmidt1/ci-support-files:$DISTRO /src/.ci/ci-linux-build.sh
+        docker run -v `pwd`:/src -w /src stefanschmidt1/ci-support-files:$DISTRO /src/.ci/ci-linux-build.sh $CI_BUILD_TYPE
       fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then .ci/ci-osx-build.sh ; fi