Merge in build.

[m6w6/libmemcached] / tests / libmemcached-1.0 / all_tests.h

diff --git a/tests/libmemcached-1.0/all_tests.h b/tests/libmemcached-1.0/all_tests.h
index a0103968e5db5e8b3a104d4154a9ab3f8e3c1603..c54a5071047d4b8ac7827c4260dede7b7e96c751 100644 (file)
--- a/tests/libmemcached-1.0/all_tests.h
+++ b/tests/libmemcached-1.0/all_tests.h
@@ -37,6 +37,8 @@
 
 #pragma once
 
+#include <tests/libmemcached-1.0/memcached_get.h>
+
 
 /* Clean the server before beginning testing */
 test_st tests[] ={
@@ -60,7 +62,7 @@ test_st tests[] ={
   {"memcached_fetch_result(MEMCACHED_NOTFOUND)", true, (test_callback_fn*)memcached_fetch_result_NOT_FOUND },
   {"replace", true, (test_callback_fn*)replace_test },
   {"delete", true, (test_callback_fn*)delete_test },
-  {"get", true, (test_callback_fn*)get_test },
+  {"memcached_get()", true, (test_callback_fn*)get_test },
   {"get2", false, (test_callback_fn*)get_test2 },
   {"get3", false, (test_callback_fn*)get_test3 },
   {"get4", false, (test_callback_fn*)get_test4 },
@@ -122,6 +124,11 @@ test_st touch_tests[] ={
   {0, 0, 0}
 };
 
+test_st kill_TESTS[] ={
+  {"kill(HUP)", 0, (test_callback_fn*)kill_HUP_TEST},
+  {0, 0, 0}
+};
+
 test_st memcached_stat_tests[] ={
   {"memcached_stat() INVALID ARG", 0, (test_callback_fn*)memcached_stat_TEST},
   {"memcached_stat()", 0, (test_callback_fn*)memcached_stat_TEST2},
@@ -467,5 +474,6 @@ collection_st collection[] ={
   {"touch", 0, 0, touch_tests},
   {"touch", (test_callback_fn*)pre_binary, 0, touch_tests},
   {"memcached_stat()", 0, 0, memcached_stat_tests},
+  {"kill()", 0, 0, kill_TESTS},
   {0, 0, 0, 0}
 };