X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemcp.cc;h=698041e69043ae895deb9e83b7332004b5b8ce78;hb=2b1d1f93e41229a47fff8362fb70012bc2cff9d3;hp=c22c4db7db55f28505c834641420e0ae1a7a1095;hpb=956d15b5b1f3f3518eb374a3a9e0393e9dacd3b6;p=m6w6%2Flibmemcached diff --git a/tests/memcp.cc b/tests/memcp.cc index c22c4db7..698041e6 100644 --- a/tests/memcp.cc +++ b/tests/memcp.cc @@ -56,15 +56,17 @@ static test_return_t quiet_test(void *) { 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 *) { - 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; } @@ -72,9 +74,10 @@ static test_return_t server_test(void *) { 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; } @@ -94,7 +97,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error) { if (HAVE_MEMCACHED_BINARY == 0) { - error= TEST_FATAL; + error= TEST_SKIPPED; return NULL; }