Merge in sasl update

[m6w6/libmemcached] / tests / plus.cpp

diff --git a/tests/plus.cpp b/tests/plus.cpp
index 90f7a0daaf58774c72d33547298d7a00aedf7b13..3bc85bc1a8632526e08e77ea873bd419afbec377 100644 (file)
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -128,13 +128,13 @@ test_return_t increment_test(memcached_st *original)
   test_compare(int_inc_value, int_ret_value);
 
   test_true(mcach.increment(key, 1, &int_ret_value));
-  test_compare(2UL, int_ret_value);
+  test_compare(uint64_t(2), int_ret_value);
 
   test_true(mcach.increment(key, 1, &int_ret_value));
-  test_compare(3UL, int_ret_value);
+  test_compare(uint64_t(3), int_ret_value);
 
   test_true(mcach.increment(key, 5, &int_ret_value));
-  test_compare(8UL, int_ret_value);
+  test_compare(uint64_t(8), int_ret_value);
 
   return TEST_SUCCESS;
 }
@@ -258,6 +258,7 @@ collection_st collection[] ={
 
 #define SERVERS_TO_CREATE 5
 
+#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
 #include "libmemcached_world.h"
 
 void get_world(Framework *world)