Updated test harness, merged Trond's fix for OSX hang.

[awesomized/libmemcached] / tests / test.h

diff --git a/tests/test.h b/tests/test.h
index 77adaf539c21a06ce085bdf66cbd9b4962e34d34..28d29a41c79d118e47ab741c3f198baf6776b2ae 100644 (file)
--- a/tests/test.h
+++ b/tests/test.h
@@ -3,10 +3,10 @@
 */
 #ifdef __cplusplus
 extern "C" {
-
 #endif
+
 #include <libmemcached/memcached.h>
-#include "../libmemcached/common.h"
+#include <stdio.h>
 
 typedef struct world_st world_st;
 typedef struct collection_st collection_st;
@@ -16,17 +16,18 @@ typedef enum {
   TEST_SUCCESS= 0, /* Backwards compatibility */
   TEST_FAILURE,
   TEST_MEMORY_ALLOCATION_FAILURE,
+  TEST_SKIPPED,
   TEST_MAXIMUM_RETURN /* Always add new error code before */
-} test_return;
+} test_return_t;
 
 struct test_st {
-  char *name;
+  const char *name;
   unsigned int requires_flush;
-  test_return (*function)(memcached_st *memc);
+  test_return_t (*function)(memcached_st *memc);
 };
 
 struct collection_st {
-  char *name;
+  const char *name;
   memcached_return (*pre)(memcached_st *memc);
   memcached_return (*post)(memcached_st *memc);
   test_st *tests;