projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update RPM rules.
[m6w6/libmemcached]
/
libtest
/
unittest.cc
diff --git
a/libtest/unittest.cc
b/libtest/unittest.cc
index bbb56c661ec8b0c396a3d54424be0f51a2076133..a2843d27fc324f9c4de5076104cce1ef8f751b20 100644
(file)
--- a/
libtest/unittest.cc
+++ b/
libtest/unittest.cc
@@
-540,7
+540,7
@@
static test_return_t memcached_sasl_test(void *object)
server_startup_st *servers= (server_startup_st*)object;
test_true(servers);
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 (MEMCACHED_SASL_BINARY)
{
@@
-618,9
+618,9
@@
static test_return_t application_doesnotexist_BINARY(void *)
true_app.will_fail();
const char *args[]= { "--fubar", 0 };
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));
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.run(args));
#else
ASSERT_EQ(Application::SUCCESS, true_app.run(args));
@@
-818,8
+818,8
@@
static test_return_t wait_services_appliction_TEST(void *)
static test_return_t gdb_wait_services_appliction_TEST(void *)
{
test_skip(true, false);
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 ));
#endif
test_skip(0, access("/etc/services", R_OK ));
@@
-842,8
+842,8
@@
static test_return_t gdb_abort_services_appliction_TEST(void *)
test_skip(0, access("libtest/abort", X_OK ));
test_skip(true, false);
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);
#endif
libtest::Application abort_app("libtest/abort", true);