Remove the server number file (it was no longer required).

diff --git a/tests/libmemcached-1.0/generate.cc b/tests/libmemcached-1.0/generate.cc
index 83552304554c976ed6426e3d77c2ae0038c97832..4411d77f22129ed07e8bef1accd197b186c7b4c7 100644 (file)
--- a/tests/libmemcached-1.0/generate.cc
+++ b/tests/libmemcached-1.0/generate.cc
@@ -43,7 +43,6 @@
 
 #include <tests/libmemcached-1.0/generate.h>
 #include <tests/libmemcached-1.0/fetch_all_results.h>
-#include "tests/libmemcached-1.0/servers_to_create.h"
 #include "tests/libmemcached-1.0/callback_counter.h"
 
 #include "clients/generator.h"
@@ -113,7 +112,7 @@ test_return_t generate_data_with_stats(memcached_st *memc)
   memcached_stat_st *stat_p= memcached_stat(memc, NULL, &rc);
   test_true(stat_p);
 
-  for (uint32_t host_index= 0; host_index < SERVERS_TO_CREATE; host_index++)
+  for (uint32_t host_index= 0; host_index < memcached_server_count(memc); host_index++)
   {
     /* This test was changes so that "make test" would work properlly */
     if (DEBUG)

diff --git a/tests/libmemcached-1.0/include.am b/tests/libmemcached-1.0/include.am
index 279e2a39593fca45490255ae26b89e71d70c0b53..48a03695468003e5b58ddb85a3226144cd987111 100644 (file)
--- a/tests/libmemcached-1.0/include.am
+++ b/tests/libmemcached-1.0/include.am
@@ -25,7 +25,6 @@ noinst_HEADERS+= \
                 tests/libmemcached-1.0/generate.h \
                 tests/libmemcached-1.0/haldenbrand.h \
                 tests/libmemcached-1.0/mem_functions.h \
-                tests/libmemcached-1.0/servers_to_create.h \
                 tests/libmemcached-1.0/setup_and_teardowns.h \
                 tests/libmemcached-1.0/stat.h \
                 tests/namespace.h \

diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc
index ef7725e7ec82c741c7388f9d8d2ef5b60d5b875e..1f48aa13b5a05f86f9b7feb91e1e3cc5e3dc725b 100644 (file)
--- a/tests/libmemcached-1.0/mem_functions.cc
+++ b/tests/libmemcached-1.0/mem_functions.cc
@@ -79,8 +79,6 @@ using namespace libtest;
 
 #include "tests/hash_results.h"
 
-#include "tests/libmemcached-1.0/servers_to_create.h"
-
 #include "tests/libmemcached-1.0/callback_counter.h"
 #include "tests/libmemcached-1.0/fetch_all_results.h"
 #include "tests/libmemcached-1.0/mem_functions.h"

diff --git a/tests/libmemcached-1.0/servers_to_create.h b/tests/libmemcached-1.0/servers_to_create.h
deleted file mode 100644 (file)
index 45b7641..0000000
--- a/tests/libmemcached-1.0/servers_to_create.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  Libmemcached Client and Server 
- *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *      * Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *      * Redistributions in binary form must reproduce the above
- *  copyright notice, this list of conditions and the following disclaimer
- *  in the documentation and/or other materials provided with the
- *  distribution.
- *
- *      * The names of its contributors may not be used to endorse or
- *  promote products derived from this software without specific prior
- *  written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#pragma once
-#define SERVERS_TO_CREATE 5