diff options
| author | Teodor Mircea Ionita <teodor@mariadb.org> | 2018-05-29 10:26:01 +0300 |
|---|---|---|
| committer | Vicențiu-Marian Ciorbaru <cvicentiu@gmail.com> | 2018-06-29 13:57:36 +0300 |
| commit | 5cdc70b8a1726811f7567b8a93ce9178184c29dd (patch) | |
| tree | f6e9734afd8154d76196267dde2960b3df1ed9f1 /.travis.compiler.sh | |
| parent | 724a5105cba31fe48bd0a2754d074d8942b21153 (diff) | |
| download | mariadb-git-5cdc70b8a1726811f7567b8a93ce9178184c29dd.tar.gz | |
MDEV-16213: Improvements and adjustments to Travis config
Several improvements have been made so that builds run
faster and with fewer canceled jobs:
* Set ccache max size to 1GB. Was 512MB for Linux
(too low for MariaDB) and 5GB on macOS with defaults;
* Don't install libasan in Travis if not necessary.
Sicne ASAN is disabled for the time being, save
time/resources for other steps;
* Decrease number of parallel processes. To prevent
resource exhaustion leading to poor performance. According
to Travis docs, a max of 4 concurrent processses should be
run per job:
https://docs.travis-ci.com/user/common-build-problems/#My-build-script-is-killed-without-any-error
* Reconsider tests exec order and split huge main and rocksdb
test suites into their own job, decreasing the chance of going
over the Travis job execution limit and getting killed;
* Increase Travis testcase-timeout to 4 minutes. Occasionally
on Ubuntu target and frequently on macOS, many tests in main,
rpl, binlog suites take longer than 2 minutes, resulting in
many jobs failing, when in reality the failing tests didn't
get a chance to complete. From my testing, along with the other
speedups, i.e. increasing ccache size, a timeout of 4 minutes
should be Ok. Revert to 3 minutes of necessary.
* Build with GCC and Clang version 5,6 only.
* Rename GCC_VERSION to CC_VERSION for clarity. We are using
two compilers after all, GCC and Clang.
* Stop using somewhat obsolete Clang4 in Travis. Also, was the
reason for the failing test suites in MDEV-15430.
Diffstat (limited to '.travis.compiler.sh')
| -rwxr-xr-x | .travis.compiler.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/.travis.compiler.sh b/.travis.compiler.sh index db5c9ee01ce..de3b0d82823 100755 --- a/.travis.compiler.sh +++ b/.travis.compiler.sh @@ -7,10 +7,6 @@ if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then 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++-4.0 ;; - 6) CXX=clang++-5.0 ;; - esac export CXX CC=${CXX/++/} elif [[ "${CXX}" == 'g++' ]]; then CMAKE_OPT="" @@ -18,16 +14,16 @@ if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then CMAKE_OPT="${CMAKE_OPT} -DWITHOUT_TOKUDB_STORAGE_ENGINE=TRUE" CMAKE_OPT="${CMAKE_OPT} -DWITHOUT_MROONGA_STORAGE_ENGINE=TRUE" fi - export CXX=g++-${GCC_VERSION} - export CC=gcc-${GCC_VERSION} + export CXX=g++-${CC_VERSION} + export CC=gcc-${CC_VERSION} fi - if [[ ${GCC_VERSION} == 6 ]]; then + if [[ ${CC_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 + #elif [[ ${CC_VERSION} != 5 ]]; then #CMAKE_OPT="${CMAKE_OPT} -DWITH_ASAN=ON" fi else |