hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Travis builds

Browse Source 
The travis builds failed due to outdated build scripts. The queuemanager
also failed to build on non-Debug builds.
This commit is contained in:
Markus Makela
2016-09-13 11:03:48 +03:00
parent 8baba28450
commit da9c7db231
4 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -6,18 +6,8 @@ os: linux
env: env:
global: global:
- MARIADB_URL=https://downloads.mariadb.org/interstitial/mariadb-5.5.48/bintar-linux-glibc_214-x86_64/mariadb-5.5.48-linux-glibc_214-x86_64.tar.gz/from/http%3A//mirror.netinch.com/pub/mariadb/
- MARIADB_TAR=mariadb-5.5.48-linux-glibc_214-x86_64.tar.gz
- MARIADB_DIR=mariadb-5.5.48-linux-x86_64
- secure: "kfzqiIq1XhZ89XYsnqFhPKr5UWB+W4fYAYpOYOLgWMmqfjwqQTm1nN/A6TuFmdbTrzB6hLawsxIUrPS+QKs4TI8tTQMRZ8IZV4TIUQVa7SNQljwrKvnSu0fSoqpPrvXxjEjbTlvpo7X5EKCyCB0Xz6NaYVJIvE9bYnwCEAJw30k=" - secure: "kfzqiIq1XhZ89XYsnqFhPKr5UWB+W4fYAYpOYOLgWMmqfjwqQTm1nN/A6TuFmdbTrzB6hLawsxIUrPS+QKs4TI8tTQMRZ8IZV4TIUQVa7SNQljwrKvnSu0fSoqpPrvXxjEjbTlvpo7X5EKCyCB0Xz6NaYVJIvE9bYnwCEAJw30k="
# prepare the environment
before_script:
# get mariadb packages from mariadb.org
- chmod +x .travis/download_mariadb.sh
- .travis/download_mariadb.sh
# actual compilation commands # actual compilation commands
script: script:
- chmod +x .travis/build_maxscale.sh - chmod +x .travis/build_maxscale.sh

5
.travis/build_maxscale.sh
View File

@ -8,16 +8,15 @@
echo TRAVIS_BUILD_DIR: ${TRAVIS_BUILD_DIR} echo TRAVIS_BUILD_DIR: ${TRAVIS_BUILD_DIR}
echo MARIADB_DIR: ${MARIADB_DIR}
mkdir build mkdir build
cd build cd build
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DMYSQL_EMBEDDED_INCLUDE_DIR=${TRAVIS_BUILD_DIR}/${MARIADB_DIR}/include/ -DMYSQL_EMBEDDED_LIBRARIES=${TRAVIS_BUILD_DIR}/${MARIADB_DIR}/lib/libmysqld.a -DERRMSG=${TRAVIS_BUILD_DIR}/${MARIADB_DIR}/share/english/errmsg.sys cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=Y
make VERBOSE=1 make VERBOSE=1
make test
sudo make install sudo make install
sudo make testcore
sudo ./postinst sudo ./postinst
maxscale --version maxscale --version

12
.travis/download_mariadb.sh
View File

@ -1,12 +0,0 @@
#/bin/sh -f
# these environment variables are set in .travis.yml
# MARIADB_URL=https://downloads.mariadb.org/interstitial/mariadb-5.5.48/bintar-linux-glibc_214-x86_64/mariadb-5.5.48-linux-glibc_214-x86_64.tar.gz/from/http%3A//mirror.netinch.com/pub/mariadb/
# MARIADB_TAR=mariadb-5.5.48-linux-glibc_214-x86_64.tar.gz
# MARIADB_DIR=mariadb-5.5.48-linux-x86_64
# get mariadb
wget --content-disposition ${MARIADB_URL}
# unompress
tar -axf ${MARIADB_TAR}

6
server/core/test/testqueuemanager.c
View File

@ -25,6 +25,10 @@
// To ensure that ss_info_assert asserts also when builing in non-debug mode. // To ensure that ss_info_assert asserts also when builing in non-debug mode.
#if !defined(SS_DEBUG) #if !defined(SS_DEBUG)
#define SS_DEBUG #define SS_DEBUG
int debug_check_fail = 1;
#else
// This is defined in the queuemanager code but only in debug builds
extern int debug_check_fail;
#endif #endif
#if defined(NDEBUG) #if defined(NDEBUG)
#undef NDEBUG #undef NDEBUG
@ -44,8 +48,6 @@
* *
*/ */
extern int debug_check_fail;
#define TEST_QUEUE_SIZE 5 #define TEST_QUEUE_SIZE 5
#define HEARTBEATS_TO_EXPIRE 3 #define HEARTBEATS_TO_EXPIRE 3
#define NUMBER_OF_THREADS 4 #define NUMBER_OF_THREADS 4