From 4d637628d34d64183a6fb0962983244680ace167 Mon Sep 17 00:00:00 2001 From: Teodor Mircea Ionita Date: Fri, 29 Jun 2018 13:51:33 +0300 Subject: [PATCH] MDEV-16213: Travis whitespace fix and remove comment --- .travis.compiler.sh | 4 ++-- .travis.yml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.compiler.sh b/.travis.compiler.sh index 3bc55ef7d205e..7a3b0dbc371af 100755 --- a/.travis.compiler.sh +++ b/.travis.compiler.sh @@ -10,10 +10,10 @@ function exclude_modules() { CMAKE_OPT="${CMAKE_OPT} -DPLUGIN_TOKUDB=NO -DPLUGIN_MROONGA=NO -DPLUGIN_SPIDER=NO -DPLUGIN_OQGRAPH=NO -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_SPHINX=NO" # exclude storage engines not being tested in current job if [[ ! "${MYSQL_TEST_SUITES}" =~ "archive" ]]; then -CMAKE_OPT="${CMAKE_OPT} -DPLUGIN_ARCHIVE=NO" + CMAKE_OPT="${CMAKE_OPT} -DPLUGIN_ARCHIVE=NO" fi if [[ ! "${MYSQL_TEST_SUITES}" =~ "rocksdb" ]]; then -CMAKE_OPT="${CMAKE_OPT} -DPLUGIN_ROCKSDB=NO" + CMAKE_OPT="${CMAKE_OPT} -DPLUGIN_ROCKSDB=NO" fi } diff --git a/.travis.yml b/.travis.yml index 9ed9b1ed5379e..6142e76e1e04c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -177,8 +177,6 @@ script: -DWITH_SSL=system -DWITH_ZLIB=system - make -j 4 - cd mysql-test -# With ASAN use --thread-stack=400K to account for overhead -# Test timeout needs to be 10 (minutes) or less due to travis job timeout - travis_wait 30 ./mtr --force --max-test-fail=20 --parallel=4 --testcase-timeout=${TEST_CASE_TIMEOUT} --suite=${MYSQL_TEST_SUITES} --skip-test-list=unstable-tests