projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
cmake: use link_libraries() instead of add_link_options() for sanitizers
[m6w6/libmemcached]
/
tests
/
libmemcached-1.0
/
all_tests.cc
diff --git
a/tests/libmemcached-1.0/all_tests.cc
b/tests/libmemcached-1.0/all_tests.cc
index bfa64c24aff64d5957df34b49e488ab16b35a808..a7cbd2c0aad1d4f6b10b40de240851ba5e5781ad 100644
(file)
--- a/
tests/libmemcached-1.0/all_tests.cc
+++ b/
tests/libmemcached-1.0/all_tests.cc
@@
-35,9
+35,9
@@
*
*/
*
*/
-#include
<config.h>
-#include
<libtest/test.hpp>
-
+#include
"mem_config.h"
+#include
"libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
#include "tests/basic.h"
#include "tests/debug.h"
#include "tests/deprecated.h"
#include "tests/basic.h"
#include "tests/debug.h"
#include "tests/deprecated.h"
@@
-71,7
+71,7
@@
#include <algorithm>
#include <algorithm>
-void get_world(
Framework *
world)
+void get_world(
libtest::Framework*
world)
{
if (getenv("LIBMEMCACHED_SERVER_NUMBER"))
{
{
if (getenv("LIBMEMCACHED_SERVER_NUMBER"))
{
@@
-82,7
+82,7
@@
void get_world(Framework *world)
else
{
// Assume a minimum of 3, and a maximum of 8
else
{
// Assume a minimum of 3, and a maximum of 8
- world->servers().set_servers_to_run(
libtest::number_of_cpus() > 3
?
+ world->servers().set_servers_to_run(
(libtest::number_of_cpus() > 3)
?
std::min(libtest::number_of_cpus(), size_t(8)) : 3);
}
std::min(libtest::number_of_cpus(), size_t(8)) : 3);
}