Merge in trunk

[awesomized/libmemcached] / tests / mem_functions.cc

diff --git a/tests/mem_functions.cc b/tests/mem_functions.cc
index 321b5fc09fd17644b45192a508952e9609e28a49..c2fbdc322e88f1279f91d30645c2dd53f0b38783 100644 (file)
--- a/tests/mem_functions.cc
+++ b/tests/mem_functions.cc
@@ -941,8 +941,11 @@ static test_return_t bad_key_test(memcached_st *memc)
                  memcached_callback_set(memc_clone, MEMCACHED_CALLBACK_NAMESPACE, NULL));
 
     std::vector <char> longkey;
-    longkey.reserve(MEMCACHED_MAX_KEY);
-    longkey.insert(longkey.end(), MEMCACHED_MAX_KEY, 'a');
+    {
+      std::vector<char>::iterator it= longkey.begin();
+      longkey.insert(it, MEMCACHED_MAX_KEY, 'a');
+    }
+
     test_compare(longkey.size(), size_t(MEMCACHED_MAX_KEY));
     {
       size_t string_length;
@@ -3119,17 +3122,16 @@ static test_return_t generate_data(memcached_st *memc)
 
 static test_return_t generate_data_with_stats(memcached_st *memc)
 {
-  uint32_t host_index= 0;
   unsigned int check_execute= execute_set(memc, global_pairs, global_count);
 
-  test_true(check_execute == global_count);
+  test_compare(check_execute, global_count);
 
   // @todo hosts used size stats
   memcached_return_t rc;
   memcached_stat_st *stat_p= memcached_stat(memc, NULL, &rc);
   test_true(stat_p);
 
-  for (host_index= 0; host_index < SERVERS_TO_CREATE; host_index++)
+  for (uint32_t host_index= 0; host_index < SERVERS_TO_CREATE; host_index++)
   {
     /* This test was changes so that "make test" would work properlly */
     if (DEBUG)
@@ -3463,7 +3465,7 @@ static test_return_t pre_jenkins(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_JENKINS);
 
-  return TEST_SUCCESS;
+  return TEST_SKIPPED;
 }