1 files changed, 42 insertions, 11 deletions
diff --git a/.travis.compiler.sh b/.travis.compiler.sh
index 8ff13e834b5..35e79e177ef 100755
--- a/.travis.compiler.sh
+++ b/.travis.compiler.sh
@@ -1,15 +1,46 @@
 #!/bin/sh
-if [[ "${TRAVIS_OS_NAME}" == 'linux' && "${CXX}" == 'clang++' ]]; then
-  case ${GCC_VERSION} in
-    4.8) MYSQL_BUILD_CXX=clang++-3.8;;
-    5) MYSQL_BUILD_CXX=clang++-3.9;;
-    6) MYSQL_BUILD_CXX=clang++-4.0;;
-  esac
-  export MYSQL_BUILD_CXX MYSQL_BUILD_CC=${MYSQL_BUILD_CXX/++/} MYSQL_COMPILER_LAUNCHER=ccache
-elif [[ "${TRAVIS_OS_NAME}" == 'linux' && "${CXX}" == 'g++' ]]; then
-  export MYSQL_BUILD_CXX=g++-${GCC_VERSION};
-  export MYSQL_BUILD_CC=gcc-${GCC_VERSION}
+set -v -x
+if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then
+  if [[ "${CXX}" == 'clang++' ]]; then
+    CMAKE_OPT="-DWITHOUT_TOKUDB_STORAGE_ENGINE=ON -DWITHOUT_MROONGA_STORAGE_ENGINE=ON"
+    #CMAKE_OPT="${CMAKE_OPT} -DWITH_ASAN=ON"
+    if which ccache ; then
+      CMAKE_OPT="${CMAKE_OPT} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
+    fi
+    case ${GCC_VERSION} in
+      5) CXX=clang++-3.9 ;;
+      6) CXX=clang++-4.0 ;;
+    esac
+    export CXX CC=${CXX/++/}
+  elif [[ "${CXX}" == 'g++' ]]; then
+    CMAKE_OPT=""
+    export CXX=g++-${GCC_VERSION}
+    export CC=gcc-${GCC_VERSION}
+  fi
+  if [[ ${GCC_VERSION} == 6 ]]; then
+         wget http://mirrors.kernel.org/ubuntu/pool/universe/p/percona-xtradb-cluster-galera-2.x/percona-xtradb-cluster-galera-2.x_165-0ubuntu1_amd64.deb ;
+         ar vx percona-xtradb-cluster-galera-2.x_165-0ubuntu1_amd64.deb
+         tar -xJvf data.tar.xz
+         export WSREP_PROVIDER=$PWD/usr/lib/libgalera_smm.so
+         MYSQL_TEST_SUITES="${MYSQL_TEST_SUITES},wsrep"
+  #elif [[ ${GCC_VERSION} != 5 ]]; then
+    #CMAKE_OPT="${CMAKE_OPT} -DWITH_ASAN=ON"
+  fi
+else
+  # osx_image based tests
+  CMAKE_OPT="-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl"
+  #CMAKE_OPT="${CMAKE_OPT} -DWITH_ASAN=ON"
+  if which ccache ; then
+    CMAKE_OPT="${CMAKE_OPT} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
+  fi
+  CMAKE_OPT="${CMAKE_OPT} -DWITHOUT_MROONGA_STORAGE_ENGINE=ON"
+  if [[ "${TYPE}" == "Debug" ]]; then
+    CMAKE_OPT="${CMAKE_OPT} -DWITHOUT_TOKUDB_STORAGE_ENGINE=ON"
+  fi
 fi
+
 # main.mysqlhotcopy_myisam consitently failed in travis containers
 # https://travis-ci.org/grooverdan/mariadb-server/builds/217661580
-echo 'main.mysqlhotcopy_myisam : unstable in containers' | tee -a debian/unstable-tests.amd64
+echo 'main.mysqlhotcopy_myisam : unstable in containers' >> ${TRAVIS_BUILD_DIR}/mysql-test/unstable-tests
+echo 'archive.mysqlhotcopy_archive : unstable in containers' >> ${TRAVIS_BUILD_DIR}/mysql-test/unstable-tests
+set +v +x