MDEV-16213: Travis whitespace fix and remove comment

MariaDB · Jun 29, 2018 · 4d63762 · 4d63762
1 parent 7b6e867
commit 4d63762
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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