Add docs for tap, and update all other documentation.

[awesomized/libmemcached] / tests / parser.cc

diff --git a/tests/parser.cc b/tests/parser.cc
index 900e89a7631ba73a14a0bfea7d38f18774471f87..704a51fc39a0652bf9d775a8fbe51367df963a1b 100644 (file)
--- a/tests/parser.cc
+++ b/tests/parser.cc
@@ -44,6 +44,7 @@
 
 #define BUILDING_LIBMEMCACHED
 #include <libmemcached/memcached.h>
+#include <libmemcached/memcached.h>
 
 #include "tests/parser.h"
 #include "tests/print.h"
@@ -190,7 +191,7 @@ scanner_variable_t test_number_options[]= {
 scanner_variable_t test_boolean_options[]= {
   { ARRAY,  make_scanner_string("--BINARY_PROTOCOL"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--BUFFER_REQUESTS"), scanner_string_null, NULL },
-  { ARRAY,  make_scanner_string("--HASH_WITH_PREFIX_KEY"), scanner_string_null, NULL },
+  { ARRAY,  make_scanner_string("--HASH_WITH_NAMESPACE"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--NOREPLY"), scanner_string_null, __check_NOREPLY },
   { ARRAY,  make_scanner_string("--RANDOMIZE_REPLICA_READ"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--SORT_HOSTS"), scanner_string_null, NULL },
@@ -204,9 +205,9 @@ scanner_variable_t test_boolean_options[]= {
 };
 
 scanner_variable_t prefix_key_strings[]= {
-  { ARRAY, make_scanner_string("--PREFIX_KEY=foo"), make_scanner_string("foo"), __check_prefix_key },
-  { ARRAY, make_scanner_string("--PREFIX-KEY=\"foo\""), make_scanner_string("foo"), __check_prefix_key },
-  { ARRAY, make_scanner_string("--PREFIX-KEY=\"This_is_a_very_long_key\""), make_scanner_string("This_is_a_very_long_key"), __check_prefix_key },
+  { ARRAY, make_scanner_string("--NAMESPACE=foo"), make_scanner_string("foo"), __check_prefix_key },
+  { ARRAY, make_scanner_string("--NAMESPACE=\"foo\""), make_scanner_string("foo"), __check_prefix_key },
+  { ARRAY, make_scanner_string("--NAMESPACE=\"This_is_a_very_long_key\""), make_scanner_string("This_is_a_very_long_key"), __check_prefix_key },
   { NIL, scanner_string_null, scanner_string_null, NULL}
 };
 
@@ -483,9 +484,11 @@ test_return_t random_statement_build_test(memcached_st*)
         break;
       case ENOMEM:
         std::cerr << "Failed to allocate memory for memcached_create_with_options()" << std::endl;
+        memcached_free(memc_ptr);
         return TEST_FAILURE;
       default:
         std::cerr << "Unknown error from memcached_create_with_options?!!" << std::endl;
+        memcached_free(memc_ptr);
         return TEST_FAILURE;
       }
     }