X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Funittest.cc;h=fafe032a047a90e8b66b04f43b2adb40cf45c67d;hb=585b2385384b32af964b5f2f999e70173b33a460;hp=c21438890c31760d13ae9ed14fc0fa3c4ab6644b;hpb=14e8f64f26c4222e67fff149d7fe9eee5a672b5b;p=awesomized%2Flibmemcached

diff --git a/libtest/unittest.cc b/libtest/unittest.cc
index c2143889..fafe032a 100644
--- 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);
 
-  test_skip(false, bool(getenv("TESTS_ENVIRONMENT")));
+  test_skip(false, bool(getenv("LOG_COMPILER")));
 
   if (MEMCACHED_SASL_BINARY)
   {
@@ -623,8 +623,12 @@ static test_return_t application_doesnotexist_BINARY(void *)
 #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());