travis: sasl

diff --git a/.travis.yml b/.travis.yml
index d5ed3f6758f1b7fe2a21568ff53f278eb7d8d8fc..1b5035cbd1c3cd75813b3e8460736425190eecf7 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,8 @@ 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
 
 #before_install:
 install:
@@ -27,19 +26,20 @@ install:
    then
      git clone -b 1.5.9 https://github.com/memcached/memcached &&
      cd memcached && ./autogen.sh &&
-     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 &
-   fi
+     CFLAGS="-O2 -pipe" ./configure --prefix=${PREFIX} --disable-dependency-tracking --enable-sasl --enable-sasl-pwdb --disable-coverage --disable-docs &&
+     make -j2 && make install;
+     ${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
  - mkdir build
 
 script:
  - cd build
- - cmake -DCMAKE_BUILD_TYPE=${BUILD} -DENABLE_SASL=${SASL} -DMEMCACHED_BINARY=${MEMCACHED_BINARY:-/usr/bin/memcached} ..
- - make
+ - cmake -DCMAKE_BUILD_TYPE=${BUILD} -DENABLE_SASL=${SASL} -DMEMCACHED_BINARY=${PREFIX:-/usr}/bin/memcached ..
+ - make -j2
  - make test
  - make install DESTDIR=.
 

diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc
index eedf002f6f1a08b3dca8fadc5194d193a9609c9b..23dea417f02b11530f7b00517f0b3a56498b7579 100644 (file)
--- a/tests/libmemcached-1.0/mem_functions.cc
+++ b/tests/libmemcached-1.0/mem_functions.cc
@@ -1880,8 +1880,8 @@ test_return_t block_add_regression(memcached_st *memc)
       Error << memcached_last_error_message(memc);
       return TEST_SKIPPED;
     }
-    test_compare(*memc, MEMCACHED_SUCCESS);
-    test_compare(rc, MEMCACHED_SUCCESS);
+    test_compare(MEMCACHED_SUCCESS,*memc);
+    test_compare(MEMCACHED_SUCCESS, rc);
   }
 
   return TEST_SUCCESS;