projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
try exotic arch on travis [cirrus skip]
[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 c9536da11ec8818275c5c9338c6d1d108083d047..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"
@@
-45,10
+45,10
@@
#include "tests/exist.h"
#include "tests/ketama.h"
#include "tests/namespace.h"
#include "tests/exist.h"
#include "tests/ketama.h"
#include "tests/namespace.h"
-#include "tests/parser.h"
#include "tests/libmemcached-1.0/dump.h"
#include "tests/libmemcached-1.0/generate.h"
#include "tests/libmemcached-1.0/haldenbrand.h"
#include "tests/libmemcached-1.0/dump.h"
#include "tests/libmemcached-1.0/generate.h"
#include "tests/libmemcached-1.0/haldenbrand.h"
+#include "tests/libmemcached-1.0/parser.h"
#include "tests/libmemcached-1.0/stat.h"
#include "tests/touch.h"
#include "tests/callbacks.h"
#include "tests/libmemcached-1.0/stat.h"
#include "tests/touch.h"
#include "tests/callbacks.h"
@@
-69,7
+69,9
@@
#include "tests/libmemcached_world.h"
#include "tests/libmemcached_world.h"
-void get_world(Framework *world)
+#include <algorithm>
+
+void get_world(libtest::Framework* world)
{
if (getenv("LIBMEMCACHED_SERVER_NUMBER"))
{
{
if (getenv("LIBMEMCACHED_SERVER_NUMBER"))
{
@@
-79,13
+81,15
@@
void get_world(Framework *world)
}
else
{
}
else
{
- world->servers().set_servers_to_run(8);
+ // Assume a minimum of 3, and a maximum of 8
+ world->servers().set_servers_to_run((libtest::number_of_cpus() > 3) ?
+ std::min(libtest::number_of_cpus(), size_t(8)) : 3);
}
}
- world->collections
= collection
;
+ world->collections
(collection)
;
- world->
_create= (test_callback_create_fn*)world_create
;
- world->
_destroy= (test_callback_destroy_fn*)world_destroy
;
+ world->
create((test_callback_create_fn*)world_create)
;
+ world->
destroy((test_callback_destroy_fn*)world_destroy)
;
world->set_runner(new LibmemcachedRunner);
world->set_runner(new LibmemcachedRunner);