mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-16213: Travis whitespace fix and remove comment

Browse source
This commit is contained in:
Teodor Mircea Ionita 2018-06-29 13:51:33 +03:00 • committed by Vicențiu-Marian Ciorbaru
commit 4d637628d3
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.compiler.sh
View file

@ -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" 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 # exclude storage engines not being tested in current job
if [[ ! "${MYSQL_TEST_SUITES}" =~ "archive" ]]; then if [[ ! "${MYSQL_TEST_SUITES}" =~ "archive" ]]; then
CMAKE_OPT="${CMAKE_OPT} -DPLUGIN_ARCHIVE=NO" CMAKE_OPT="${CMAKE_OPT} -DPLUGIN_ARCHIVE=NO"
fi fi
if [[ ! "${MYSQL_TEST_SUITES}" =~ "rocksdb" ]]; then if [[ ! "${MYSQL_TEST_SUITES}" =~ "rocksdb" ]]; then
CMAKE_OPT="${CMAKE_OPT} -DPLUGIN_ROCKSDB=NO" CMAKE_OPT="${CMAKE_OPT} -DPLUGIN_ROCKSDB=NO"
fi fi
} }

2
.travis.yml
View file

@ -177,8 +177,6 @@ script:
-DWITH_SSL=system -DWITH_ZLIB=system -DWITH_SSL=system -DWITH_ZLIB=system
- make -j 4 - make -j 4
- cd mysql-test - 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} - travis_wait 30 ./mtr --force --max-test-fail=20 --parallel=4 --testcase-timeout=${TEST_CASE_TIMEOUT}
--suite=${MYSQL_TEST_SUITES} --suite=${MYSQL_TEST_SUITES}
--skip-test-list=unstable-tests --skip-test-list=unstable-tests