X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.travis.yml;h=20d4e7a62db94d00d28c67f1cbc66803753eb8c8;hb=d347d509b7c0150a75ba77307a61411a2a114599;hp=931db3ad45632109c484f9db43e3b3e790e991d5;hpb=97b5d58cacd3c91183c82f8327004963aebb33c0;p=m6w6%2Flibmemcached

diff --git a/.travis.yml b/.travis.yml
index 931db3ad..20d4e7a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,31 +16,32 @@ compiler:
  - clang
 
 env:
-# - BUILD=Release SASL=false
-# - BUILD=Debug SASL=false
- - BUILD=Debug SASL=true MEMCACHED_BINARY=/opt/bin/memcached MEMCACHED_PORT=11212
+ - BUILD=Release SASL=false
+ - 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 &&
-     cd memcached &&
-     CFLAGS="-O2 -pipe" ./configure --prefix=/opt --disable-dependency-tracking --enable-sasl --enable-sasl-pwdb --disable-coverage --disable-docs &&
-     make && make install &&
-     /opt/bin/memcached -l 127.0.0.1 -p ${MEMCACHED_PORT} -U ${MEMCACHED_PORT} -m 128 &
-   endif
+     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 &
+   fi;
 
 
 before_script:
- - echo stats settings | nc -q 0 localhost ${MEMCACHED_PORT:11211} | column -t
+ - echo stats settings | nc -q 0 localhost ${PORT:-11211} | column -t
+ - killall memcached
  - mkdir build
 
 script:
  - cd build
- - cmake -DCMAKE_BUILD_TYPE=${BUILD} -DENABLE_SASL=${SASL} -DMEMCACHED_BINARY=${MEMCACHED_BINARY:/usr/bin/memcached} ..
- - make
+ - cmake -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=${BUILD} -DENABLE_SASL=${SASL} -DMEMCACHED_BINARY=${PREFIX:-/usr}/bin/memcached ..
+ - make -j2
  - make test
  - make install DESTDIR=.