Update to add ENV variable LIBMEMCACHED

[m6w6/libmemcached] / tests / libmemcached-1.0 / parser.cc

diff --git a/tests/libmemcached-1.0/parser.cc b/tests/libmemcached-1.0/parser.cc
index 32b0d9d84c0ff15c7b1bdcf301f2277c66c855fa..3afc12baa42228b93b31e8ee300d89fba81a72de 100644 (file)
--- a/tests/libmemcached-1.0/parser.cc
+++ b/tests/libmemcached-1.0/parser.cc
@@ -43,12 +43,11 @@ using namespace libtest;
 #include <vector>
 #include <string>
 #include <cerrno>
-#include <cassert>
 
 #include <libmemcached/memcached.h>
 #include <libmemcached/util.h>
 
-#include <tests/parser.h>
+#include <tests/libmemcached-1.0/parser.h>
 #include <tests/print.h>
 
 enum scanner_type_t
@@ -621,26 +620,25 @@ static memcached_return_t dump_server_information(const memcached_st *,
 {
   if (strcmp(memcached_server_name(instance), "localhost")) 
   {
-    assert(not memcached_server_name(instance));
+    fatal_assert(not memcached_server_name(instance));
     return MEMCACHED_FAILURE;
   }
 
   if (memcached_server_port(instance) < 8888 or memcached_server_port(instance) > 8892)
   {
-    assert(not memcached_server_port(instance));
+    fatal_assert(not memcached_server_port(instance));
     return MEMCACHED_FAILURE;
   }
 
   if (instance->weight > 5 or instance->weight < 2)
   {
-    assert(not instance->weight);
+    fatal_assert(not instance->weight);
     return MEMCACHED_FAILURE;
   }
 
   return MEMCACHED_SUCCESS;
 }
 
-
 test_return_t test_hostname_port_weight(memcached_st *)
 {
   const char *server_string= "--server=localhost:8888/?2 --server=localhost:8889/?3 --server=localhost:8890/?4 --server=localhost:8891/?5 --server=localhost:8892/?3";
@@ -762,7 +760,11 @@ test_return_t regression_bug_71231153_poll(memcached_st *)
     char *value= memcached_get(memc, test_literal_param("test"), &value_len, NULL, &rc);
     test_false(value);
     test_zero(value_len);
+#ifdef __APPLE__
+    test_compare_got(MEMCACHED_CONNECTION_FAILURE, rc, memcached_last_error_message(memc));
+#else
     test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_last_error_message(memc));
+#endif
 
     memcached_free(memc);
   }