X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.travis.yml;h=03cf473f1afa00fd9cce279ab1cec089246be840;hb=cbaa9f46519f9b085e28db5f44247d23ca7ec5a4;hp=4fc32d1c701516cb4ee21d120cc756bd40173b38;hpb=7581a0e1420f8df57e2bd814ed9af9373c467f58;p=awesomized%2Flibmemcached

diff --git a/.travis.yml b/.travis.yml
index 4fc32d1c..03cf473f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,18 +17,19 @@ compiler:
 
 env:
  - BUILD=Release SASL=false
- - BUILD=Debug SASL=true PREFIX=/opt PORT=11212
+ - BUILD=Debug SASL=true PREFIX=/opt PORT=11212 MC_VERSION=1.5.22
+ - BUILD=Debug SASL=false PREFIX=/opt PORT=11212 MC_VERSION=1.6.6
 
 #before_install:
 install:
  - |
-   if ${SASL};
+   if ${SASL} || test -n "$MC_VERSION";
    then
-     git clone -b 1.5.9 https://github.com/memcached/memcached &&
+     git clone -b ${MC_VERSION:-1.5.22} https://github.com/memcached/memcached &&
      cd memcached && ./autogen.sh &&
      CFLAGS="-O2 -pipe" ./configure --prefix=${PREFIX} --disable-dependency-tracking --enable-sasl --enable-sasl-pwdb --disable-coverage --disable-docs &&
-     make -j2 && make install;
-     cd .. && ${PREFIX}/bin/memcached -l 127.0.0.1 -p ${PORT} -U ${PORT} -m 128 &
+     make -j2 && make install && cd ..;
+     ${PREFIX}/bin/memcached -l 127.0.0.1 -p ${PORT} -U ${PORT} -m 128 &
    fi;
 
 
@@ -38,7 +39,7 @@ before_script:
 
 script:
  - cd build
- - cmake -DCMAKE_BUILD_TYPE=${BUILD} -DENABLE_SASL=${SASL} -DMEMCACHED_BINARY=${PREFIX:-/usr}/bin/memcached ..
+ - cmake -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=${BUILD} -DENABLE_SASL=${SASL} -DMEMCACHED_BINARY=${PREFIX:-/usr}/bin/memcached ..
  - make -j2
  - make test
  - make install DESTDIR=.