projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge
[awesomized/libmemcached]
/
tests
/
parser.cc
diff --git
a/tests/parser.cc
b/tests/parser.cc
index b29a6fdcfb66f1c36397bc27706cf0aadf230728..dd8062c287547d10a3a03b893f6c7adddfabf2c2 100644
(file)
--- a/
tests/parser.cc
+++ b/
tests/parser.cc
@@
-46,9
+46,7
@@
using namespace libtest;
#include <cerrno>
#include <cassert>
#include <cerrno>
#include <cassert>
-#define BUILDING_LIBMEMCACHED
-// !NEVER use common.h, always use memcached.h in your own apps
-#include <libmemcached/common.h>
+#include <libmemcached/memcached.h>
#include <libmemcached/util.h>
#include <tests/parser.h>
#include <libmemcached/util.h>
#include <tests/parser.h>
@@
-343,7
+341,6
@@
test_return_t memcached_create_with_options_with_filename(memcached_st*)
memcached_st *memc_ptr;
memc_ptr= memcached(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\""));
test_true_got(memc_ptr, "memcached() failed");
memcached_st *memc_ptr;
memc_ptr= memcached(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\""));
test_true_got(memc_ptr, "memcached() failed");
- test_strcmp(SUPPORT_EXAMPLE_CNF, memcached_array_string(memc_ptr->configure.filename));
memcached_free(memc_ptr);
return TEST_SUCCESS;
memcached_free(memc_ptr);
return TEST_SUCCESS;
@@
-651,7
+648,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);
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));
test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_last_error_message(memc));
+#endif
memcached_free(memc);
}
memcached_free(memc);
}