Commit 93261d46 authored by Justin Brewer's avatar Justin Brewer Committed by Mark Nunberg
Browse files

Update .travis-ci.yml to use cmake


Signed-off-by: default avatarJustin Brewer <jzb0012@auburn.edu>
parent ebe1657c
...@@ -8,12 +8,6 @@ os: ...@@ -8,12 +8,6 @@ os:
- linux - linux
- osx - osx
branches:
only:
- staging
- trying
- master
before_script: before_script:
- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew update; brew install redis; fi - if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew update; brew install redis; fi
...@@ -26,20 +20,38 @@ addons: ...@@ -26,20 +20,38 @@ addons:
- libc6-dev-i386 - libc6-dev-i386
- libc6-dbg:i386 - libc6-dbg:i386
- gcc-multilib - gcc-multilib
- g++-multilib
- valgrind - valgrind
env: env:
- CFLAGS="-Werror" - BITS="32"
- PRE="valgrind --track-origins=yes --leak-check=full" - BITS="64"
- TARGET="32bit" TARGET_VARS="32bit-vars" CFLAGS="-Werror"
- TARGET="32bit" TARGET_VARS="32bit-vars" PRE="valgrind --track-origins=yes --leak-check=full" script:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
matrix: if [ "$BITS" == "32" ]; then
exclude: CFLAGS="-m32 -Werror";
- os: osx CXXFLAGS="-m32 -Werror";
env: PRE="valgrind --track-origins=yes --leak-check=full" LDFLAGS="-m32";
else
- os: osx EXTRA_CMAKE_OPTS="-DENABLE_EXAMPLES:BOOL=ON";
env: TARGET="32bit" TARGET_VARS="32bit-vars" PRE="valgrind --track-origins=yes --leak-check=full" CFLAGS="-Werror";
CXXFLAGS="-Werror";
script: make $TARGET CFLAGS="$CFLAGS" && make check PRE="$PRE" && make $TARGET_VARS hiredis-example fi;
else
TEST_PREFIX="valgrind --track-origins=yes --leak-check=full";
if [ "$BITS" == "32" ]; then
CFLAGS="-m32 -Werror";
CXXFLAGS="-m32 -Werror";
LDFLAGS="-m32";
else
EXTRA_CMAKE_OPTS="-DENABLE_EXAMPLES:BOOL=ON";
CFLAGS="-Werror";
CXXFLAGS="-Werror";
fi;
fi;
export CFLAGS CXXFLAGS LDFLAGS TEST_PREFIX EXTRA_CMAKE_OPTS
- mkdir build/ && cd build/
- cmake .. ${EXTRA_CMAKE_OPTS}
- make VERBOSE=1
- ctest -V
...@@ -22,4 +22,4 @@ bind 127.0.0.1 ...@@ -22,4 +22,4 @@ bind 127.0.0.1
unixsocket ${SOCK_FILE} unixsocket ${SOCK_FILE}
EOF EOF
./hiredis-test -h 127.0.0.1 -p ${REDIS_PORT} -s ${SOCK_FILE} ${TEST_PREFIX:-} ./hiredis-test -h 127.0.0.1 -p ${REDIS_PORT} -s ${SOCK_FILE}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment