try {
_SUCCESS;
}
- catch (libtest::__success)
+ catch (const libtest::__success&)
{
return TEST_SUCCESS;
}
try {
SKIP_IF(true);
}
- catch (libtest::__skipped e)
+ catch (const libtest::__skipped&)
{
return TEST_SUCCESS;
}
return TEST_FAILURE;
}
+static test_return_t test_throw_skip_unless_macro_TEST(void *)
+{
+ try {
+ SKIP_UNLESS(false);
+ }
+ catch (const libtest::__skipped&)
+ {
+ return TEST_SUCCESS;
+ }
+ catch (...)
+ {
+ FAIL("SLIP_UNLESS() failed to throw libtest::_skipped");
+ }
+
+ FAIL("SLIP_UNLESS() failed to throw");
+
+ return TEST_FAILURE;
+}
+
static test_return_t test_throw_skip_TEST(void *)
{
try {
throw libtest::__skipped(LIBYATL_DEFAULT_PARAM, "basic test");
}
- catch (libtest::__skipped e)
+ catch (const libtest::__skipped&)
{
return TEST_SUCCESS;
}
}
#pragma GCC diagnostic ignored "-Wstack-protector"
+#ifdef __clang__
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wformat-security"
+#endif
+
static test_return_t ASSERT_FALSE__TEST(void *)
{
try {
- ASSERT_FALSE_(true, __func__);
+ ASSERT_FALSE(true);
+ }
+ catch (const libtest::__failure& e)
+ {
+ ASSERT_STREQ(e.what(), "Assertion '!true'");
+ return TEST_SUCCESS;
+ }
+ catch (...)
+ {
+ return TEST_FAILURE;
+ }
+
+ return TEST_FAILURE;
+}
+
+#ifdef __clang__
+# pragma GCC diagnostic pop
+#endif
+
+static test_return_t ASSERT_NEQ_FAIL_TEST(void *)
+{
+ try {
+ ASSERT_NEQ(1,1);
}
catch (const libtest::__failure& e)
{
- ASSERT_STREQ(e.what(), "Assertion '!true' [ ASSERT_FALSE__TEST ]");
+ ASSERT_STREQ(e.what(), "Assertion '1' == '1'");
return TEST_SUCCESS;
}
catch (...)
return TEST_FAILURE;
}
+static test_return_t ASSERT_NEQ_TEST(void *)
+{
+ ASSERT_NEQ(1,0);
+
+ return TEST_SUCCESS;
+}
+
static test_return_t ASSERT_FALSE_TEST(void *)
{
try {
test_skip(true, has_drizzled());
- test_skip(true, server_startup(*servers, "drizzled", get_free_port(), 0, NULL, false));
+ test_skip(true, server_startup(*servers, "drizzled", get_free_port(), NULL));
return TEST_SUCCESS;
}
test_true(servers and servers->validate());
test_skip(true, has_gearmand());
- test_skip(true, server_startup(*servers, "gearmand", get_free_port(), 0, NULL, false));
+ test_skip(true, server_startup(*servers, "gearmand", get_free_port(), NULL));
servers->clear();
return TEST_SUCCESS;
test_true(servers);
fatal::disable();
- ASSERT_EQ(servers->start_server(testing_service, LIBTEST_FAIL_PORT, 0, NULL, false), true);
+ ASSERT_EQ(servers->start_server(testing_service, LIBTEST_FAIL_PORT, NULL), true);
fatal::enable();
return TEST_SUCCESS;
server_startup_st *servers= (server_startup_st*)object;
test_true(servers);
- ASSERT_EQ(servers->start_server(testing_service, get_free_port(), 0, NULL, false), true);
+ ASSERT_EQ(servers->start_server(testing_service, get_free_port(), NULL), true);
test_true(servers->last());
pid_t last_pid= servers->last()->pid();
server_startup_st *servers= (server_startup_st*)object;
test_true(servers);
- test_true(servers->start_socket_server(testing_service, get_free_port(), 0, NULL, false));
+ test_true(servers->start_socket_server(testing_service, get_free_port(), NULL));
return TEST_SUCCESS;
}
server_startup_st *servers= (server_startup_st*)object;
test_true(servers);
- test_skip(false, bool(getenv("TESTS_ENVIRONMENT")));
+ test_skip(false, bool(getenv("LOG_COMPILER")));
if (MEMCACHED_SASL_BINARY)
{
if (HAVE_LIBMEMCACHED)
{
test_true(has_memcached_sasl());
- test_true(server_startup(*servers, "memcached-sasl", get_free_port(), 0, NULL, false));
+ test_true(server_startup(*servers, "memcached-sasl", get_free_port(), NULL));
return TEST_SUCCESS;
}
true_app.will_fail();
const char *args[]= { "--fubar", 0 };
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+#if defined(__APPLE__) && __APPLE__
ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
-#elif defined(TARGET_OS_FREEBSD) && TARGET_OS_FREEBSD
+#elif defined(__FreeBSD__) && __FreeBSD__
ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
#else
- ASSERT_EQ(Application::SUCCESS, true_app.run(args));
- ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.join());
+ Application::error_t rc = true_app.run(args);
+ if (Application::SUCCESS == rc) {
+ ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.join());
+ } else {
+ ASSERT_EQ(Application::INVALID_POSIX_SPAWN, rc);
+ }
#endif
test_zero(true_app.stdout_result().size());
static test_return_t gdb_wait_services_appliction_TEST(void *)
{
test_skip(true, false);
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
- test_skip(0, TARGET_OS_OSX);
+#if defined(__APPLE__) && __APPLE__
+ test_skip(0, __APPLE__);
#endif
test_skip(0, access("/etc/services", R_OK ));
test_skip(0, access("libtest/abort", X_OK ));
test_skip(true, false);
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
- test_skip(0, TARGET_OS_OSX);
+#if defined(__APPLE__) && __APPLE__
+ test_skip(0, __APPLE__);
#endif
libtest::Application abort_app("libtest/abort", true);
static test_return_t fatal_message_TEST(void *)
{
ASSERT_EQ(fatal_calls++, fatal::disabled_counter());
- fatal_message("Fatal test");
+ FATAL("Fatal test");
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
+static test_return_t check_for_VALGRIND(void *)
+{
+ test_skip_valgrind();
+ return TEST_SUCCESS;
+}
+
static test_return_t check_for_gearman(void *)
{
test_skip(true, HAVE_LIBGEARMAN);
static test_return_t check_for_drizzle(void *)
{
- test_skip(true, HAVE_LIBDRIZZLE);
test_skip(true, has_drizzled());
testing_service= "drizzled";
{"SUCCESS", false, test_throw_success_TEST },
{"libtest::__skipped", false, test_throw_skip_TEST },
{"SKIP_IF", false, test_throw_skip_macro_TEST },
+ {"SKIP_UNLESS", false, test_throw_skip_unless_macro_TEST },
{"FAIL", false, test_throw_fail_TEST },
{"ASSERT_FALSE_", false, ASSERT_FALSE__TEST },
{"ASSERT_FALSE", false, ASSERT_FALSE_TEST },
+ {"ASSERT_NEQ", false, ASSERT_NEQ_TEST },
+ {"ASSERT_NEQ FAIL", false, ASSERT_NEQ_FAIL_TEST },
{0, 0, 0}
};
static test_return_t check_for_curl(void *)
{
+ test_skip_valgrind();
test_skip(true, HAVE_LIBCURL);
return TEST_SUCCESS;
}
{"fatal", disable_fatal_exception, enable_fatal_exception, fatal_message_TESTS },
{"number_of_cpus()", 0, 0, number_of_cpus_TESTS },
{"create_tmpfile()", 0, 0, create_tmpfile_TESTS },
- {"dns", 0, 0, dns_TESTS },
+ {"dns", check_for_VALGRIND, 0, dns_TESTS },
{"libtest::Timer", 0, 0, timer_TESTS },
{0, 0, 0, 0}
};