X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Funittest.cc;h=0d50447783ce0c1278d6c07e1b072336ea7e4223;hb=6b83fd5838692b71a50710b9bc13680f9c586167;hp=0af3e30f8ab21977c9c7ce6c3ffbef0ae22f15b5;hpb=a0a194ba0789e0650329d81a5ed12620360789eb;p=m6w6%2Flibmemcached

diff --git a/libtest/unittest.cc b/libtest/unittest.cc
index 0af3e30f..0d504477 100644
--- a/libtest/unittest.cc
+++ b/libtest/unittest.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 #include <libtest/test.hpp>
 
@@ -42,7 +42,7 @@
 #include <libmemcached-1.0/memcached.h>
 #endif
 
-#if defined(LIBTEST_WITH_LIBGEARMAN_SUPPORT) && LIBTEST_WITH_LIBGEARMAN_SUPPORT
+#if defined(HAVE_LIBGEARMAN) && HAVE_LIBGEARMAN
 #include <libgearman/gearman.h>
 #endif
 
@@ -290,20 +290,6 @@ static test_return_t gearmand_cycle_test(void *object)
   return TEST_SUCCESS;
 }
 
-#if 0
-static test_return_t memcached_light_cycle_TEST(void *object)
-{
-  server_startup_st *servers= (server_startup_st*)object;
-  test_true(servers);
-
-  test_skip(true, bool(HAVE_MEMCACHED_LIGHT_BINARY));
-
-  test_true(server_startup(*servers, "memcached-light", get_free_port(), 0, NULL, false));
-
-  return TEST_SUCCESS;
-}
-#endif
-
 static test_return_t skip_shim(bool a, bool b)
 {
   test_skip(a, b);
@@ -748,6 +734,7 @@ static test_return_t lookup_false_TEST(void *)
 
 static test_return_t create_tmpfile_TEST(void *)
 {
+  test_skip(0, access("/usr/bin/touch", X_OK ));
   std::string tmp= create_tmpfile(__func__);
   test_compare(-1, access(tmp.c_str(), R_OK));
   test_compare(-1, access(tmp.c_str(), F_OK));
@@ -784,6 +771,16 @@ static test_return_t check_for_gearman(void *)
 {
   test_skip(true, HAVE_LIBGEARMAN);
   test_skip(true, has_gearmand());
+#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
+  if (GEARMAND_BINARY)
+  {
+    test_zero(access(GEARMAND_BINARY, X_OK ));
+  }
+  else
+  {
+    return TEST_SKIPPED;
+  }
+#endif
 
   testing_service= "gearmand";