projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update hardening flags.
[awesomized/libmemcached]
/
tests
/
memflush.cc
diff --git
a/tests/memflush.cc
b/tests/memflush.cc
index 6cafcbbab31894f19438110df62cd7af2b9a1162..3ba91459c3ab8fc696ed141c48a45fc63a35859a 100644
(file)
--- a/
tests/memflush.cc
+++ b/
tests/memflush.cc
@@
-56,15
+56,17
@@
static test_return_t quiet_test(void *)
{
const char *args[]= { "--quiet", 0 };
{
const char *args[]= { "--quiet", 0 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true));
+
return TEST_SUCCESS;
}
static test_return_t help_test(void *)
{
return TEST_SUCCESS;
}
static test_return_t help_test(void *)
{
- const char *args[]= { "--quiet", "--help", 0 };
+ const char *args[]= { "--help", 0 };
+
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
- test_true(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-72,9
+74,10
@@
static test_return_t server_test(void *)
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
- const char *args[]= { "--quiet", buffer, 0 };
+ const char *args[]= { buffer, 0 };
+
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
- test_true(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-92,26
+95,25
@@
collection_st collection[] ={
static void *world_create(server_startup_st& servers, test_return_t& error)
{
static void *world_create(server_startup_st& servers, test_return_t& error)
{
- if (
HAVE_MEMCACHED_BINARY == 0
)
+ if (
libtest::has_memcached() == false
)
{
error= TEST_SKIPPED;
return NULL;
}
{
error= TEST_SKIPPED;
return NULL;
}
- const char *argv[1]= { "memflush" };
- if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
+ if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == 0)
{
{
- error= TEST_
FAILURE
;
+ error= TEST_
SKIPPED
;
}
return &servers;
}
}
return &servers;
}
-void get_world(
Framework *
world)
+void get_world(
libtest::Framework*
world)
{
executable= "./clients/memflush";
{
executable= "./clients/memflush";
- world->collections
= collection
;
- world->
_create= world_create
;
+ world->collections
(collection)
;
+ world->
create(world_create)
;
}
}