|
[-]
[+]
|
Changed |
libmemcached.changes
|
|
|
|
[-]
[+]
|
Changed |
libmemcached.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
libmemcached-1.0.6.tar.bz2/libtest/test.cc
^
|
| @@ -1,479 +0,0 @@
-/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
- *
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <config.h>
-#include <libtest/common.h>
-
-#include <cassert>
-#include <cstdlib>
-#include <cstring>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <ctime>
-#include <fnmatch.h>
-#include <iostream>
-
-#include <signal.h>
-
-#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-
-using namespace libtest;
-
-static void stats_print(Stats *stats)
-{
- if (stats->collection_failed == 0 and stats->collection_success == 0)
- {
- return;
- }
-
- Out << "\tTotal Collections\t\t\t\t" << stats->collection_total;
- Out << "\tFailed Collections\t\t\t\t" << stats->collection_failed;
- Out << "\tSkipped Collections\t\t\t\t" << stats->collection_skipped;
- Out << "\tSucceeded Collections\t\t\t\t" << stats->collection_success;
- Outn();
- Out << "Total\t\t\t\t" << stats->total;
- Out << "\tFailed\t\t\t" << stats->failed;
- Out << "\tSkipped\t\t\t" << stats->skipped;
- Out << "\tSucceeded\t\t" << stats->success;
-}
-
-static long int timedif(struct timeval a, struct timeval b)
-{
- long us, s;
-
- us = (long)(a.tv_usec - b.tv_usec);
- us /= 1000;
- s = (long)(a.tv_sec - b.tv_sec);
- s *= 1000;
- return s + us;
-}
-
-#include <getopt.h>
-#include <unistd.h>
-
-int main(int argc, char *argv[])
-{
- bool opt_massive= false;
- unsigned long int opt_repeat= 1; // Run all tests once
- bool opt_quiet= false;
- std::string collection_to_run;
-
- // Options parsing
- {
- enum long_option_t {
- OPT_LIBYATL_VERSION,
- OPT_LIBYATL_MATCH_COLLECTION,
- OPT_LIBYATL_MASSIVE,
- OPT_LIBYATL_QUIET,
- OPT_LIBYATL_REPEAT
- };
-
- static struct option long_options[]=
- {
- { "version", no_argument, NULL, OPT_LIBYATL_VERSION },
- { "quiet", no_argument, NULL, OPT_LIBYATL_QUIET },
- { "repeat", no_argument, NULL, OPT_LIBYATL_REPEAT },
- { "collection", required_argument, NULL, OPT_LIBYATL_MATCH_COLLECTION },
- { "massive", no_argument, NULL, OPT_LIBYATL_MASSIVE },
- { 0, 0, 0, 0 }
- };
-
- int option_index= 0;
- while (1)
- {
- int option_rv= getopt_long(argc, argv, "", long_options, &option_index);
- if (option_rv == -1)
- {
- break;
- }
-
- switch (option_rv)
- {
- case OPT_LIBYATL_VERSION:
- break;
-
- case OPT_LIBYATL_QUIET:
- opt_quiet= true;
- break;
-
- case OPT_LIBYATL_REPEAT:
- opt_repeat= strtoul(optarg, (char **) NULL, 10);
- break;
-
- case OPT_LIBYATL_MATCH_COLLECTION:
- collection_to_run= optarg;
- break;
-
- case OPT_LIBYATL_MASSIVE:
- opt_massive= true;
- break;
-
- case '?':
- /* getopt_long already printed an error message. */
- Error << "unknown option to getopt_long()";
- exit(EXIT_FAILURE);
-
- default:
- break;
- }
- }
- }
-
- srandom((unsigned int)time(NULL));
-
- if (bool(getenv("YATL_REPEAT")) and (strtoul(getenv("YATL_REPEAT"), (char **) NULL, 10) > 1))
- {
- opt_repeat= strtoul(getenv("YATL_REPEAT"), (char **) NULL, 10);
- }
-
- if ((bool(getenv("YATL_QUIET")) and (strcmp(getenv("YATL_QUIET"), "0") == 0)) or opt_quiet)
- {
- opt_quiet= true;
- }
- else if (getenv("JENKINS_URL"))
- {
- if (bool(getenv("YATL_QUIET")) and (strcmp(getenv("YATL_QUIET"), "1") == 0))
- { }
- else
- {
- opt_quiet= true;
- }
- }
-
- if (opt_quiet)
- {
- close(STDOUT_FILENO);
- }
-
- char buffer[1024];
- if (getenv("LIBTEST_TMP"))
- {
- snprintf(buffer, sizeof(buffer), "%s", getenv("LIBTEST_TMP"));
- }
- else
- {
- snprintf(buffer, sizeof(buffer), "%s", LIBTEST_TEMP);
- }
-
- if (chdir(buffer) == -1)
- {
- char getcwd_buffer[1024];
- char *dir= getcwd(getcwd_buffer, sizeof(getcwd_buffer));
-
- Error << "Unable to chdir() from " << dir << " to " << buffer << " errno:" << strerror(errno);
- return EXIT_FAILURE;
- }
-
- if (libtest::libtool() == NULL)
- {
- Error << "Failed to locate libtool";
- return EXIT_FAILURE;
- }
-
- int exit_code;
-
- try {
- do {
- exit_code= EXIT_SUCCESS;
- Framework world;
-
- fatal_assert(sigignore(SIGPIPE) == 0);
-
- libtest::SignalThread signal;
- if (signal.setup() == false)
- {
- Error << "Failed to setup signals";
- return EXIT_FAILURE;
- }
-
- Stats stats;
-
- get_world(&world);
-
- test_return_t error;
- void *creators_ptr= world.create(error);
-
- switch (error)
- {
- case TEST_SUCCESS:
- break;
-
- case TEST_SKIPPED:
- Out << "SKIP " << argv[0];
- return EXIT_SUCCESS;
-
- case TEST_FAILURE:
- return EXIT_FAILURE;
- }
-
- if (getenv("YATL_COLLECTION_TO_RUN"))
- {
- if (strlen(getenv("YATL_COLLECTION_TO_RUN")))
- {
- collection_to_run= getenv("YATL_COLLECTION_TO_RUN");
- }
- }
-
- if (collection_to_run.compare("none") == 0)
- {
- return EXIT_SUCCESS;
- }
-
- if (collection_to_run.empty() == false)
- {
- Out << "Only testing " << collection_to_run;
- }
-
- char *wildcard= NULL;
- if (argc == 3)
- {
- wildcard= argv[2];
- }
-
- for (collection_st *next= world.collections; next and next->name and (not signal.is_shutdown()); next++)
- {
- bool failed= false;
- bool skipped= false;
-
- if (collection_to_run.empty() == false and fnmatch(collection_to_run.c_str(), next->name, 0))
- {
- continue;
- }
-
- stats.collection_total++;
-
- test_return_t collection_rc= world.startup(creators_ptr);
-
- if (collection_rc == TEST_SUCCESS and next->pre)
- {
- collection_rc= world.runner()->pre(next->pre, creators_ptr);
- }
-
- switch (collection_rc)
- {
- case TEST_SUCCESS:
- break;
-
- case TEST_FAILURE:
- Out << next->name << " [ failed ]";
- failed= true;
- signal.set_shutdown(SHUTDOWN_GRACEFUL);
- goto cleanup;
-
- case TEST_SKIPPED:
- Out << next->name << " [ skipping ]";
- skipped= true;
- goto cleanup;
-
- default:
- fatal_message("invalid return code");
- }
-
- Out << "Collection: " << next->name;
-
- for (test_st *run= next->tests; run->name; run++)
- {
- struct timeval start_time, end_time;
- long int load_time= 0;
-
- if (wildcard && fnmatch(wildcard, run->name, 0))
- {
- continue;
- }
-
- test_return_t return_code;
- try {
- if (test_success(return_code= world.item.startup(creators_ptr)))
- {
- if (test_success(return_code= world.item.flush(creators_ptr, run)))
- {
- // @note pre will fail is SKIPPED is returned
- if (test_success(return_code= world.item.pre(creators_ptr)))
- {
- { // Runner Code
- gettimeofday(&start_time, NULL);
- assert(world.runner());
- assert(run->test_fn);
- try
- {
- return_code= world.runner()->run(run->test_fn, creators_ptr);
- }
- // Special case where check for the testing of the exception
- // system.
- catch (libtest::fatal &e)
- {
- if (fatal::is_disabled())
- {
- fatal::increment_disabled_counter();
- return_code= TEST_SUCCESS;
- }
- else
- {
- throw;
- }
- }
-
- gettimeofday(&end_time, NULL);
- load_time= timedif(end_time, start_time);
- }
- }
-
- // @todo do something if post fails
- (void)world.item.post(creators_ptr);
- }
- else if (return_code == TEST_SKIPPED)
- { }
- else if (return_code == TEST_FAILURE)
- {
- Error << " item.flush(failure)";
- signal.set_shutdown(SHUTDOWN_GRACEFUL);
- }
- }
- else if (return_code == TEST_SKIPPED)
- { }
- else if (return_code == TEST_FAILURE)
- {
- Error << " item.startup(failure)";
- signal.set_shutdown(SHUTDOWN_GRACEFUL);
- }
- }
-
- catch (libtest::fatal &e)
- {
- Error << "Fatal exception was thrown: " << e.what();
- return_code= TEST_FAILURE;
- }
- catch (std::exception &e)
- {
- Error << "Exception was thrown: " << e.what();
- return_code= TEST_FAILURE;
- }
- catch (...)
- {
- Error << "Unknown exception occurred";
- return_code= TEST_FAILURE;
- }
-
- stats.total++;
-
- switch (return_code)
- {
- case TEST_SUCCESS:
- Out << "\tTesting " << run->name << "\t\t\t\t\t" << load_time / 1000 << "." << load_time % 1000 << "[ " << test_strerror(return_code) << " ]";
- stats.success++;
- break;
-
- case TEST_FAILURE:
- stats.failed++;
- failed= true;
- Out << "\tTesting " << run->name << "\t\t\t\t\t" << "[ " << test_strerror(return_code) << " ]";
- break;
-
- case TEST_SKIPPED:
- stats.skipped++;
- skipped= true;
- Out << "\tTesting " << run->name << "\t\t\t\t\t" << "[ " << test_strerror(return_code) << " ]";
- break;
-
- default:
- fatal_message("invalid return code");
- }
-
- if (test_failed(world.on_error(return_code, creators_ptr)))
- {
- Error << "Failed while running on_error()";
- signal.set_shutdown(SHUTDOWN_GRACEFUL);
- break;
- }
- }
-
- (void) world.runner()->post(next->post, creators_ptr);
-
-cleanup:
- if (failed == false and skipped == false)
- {
- stats.collection_success++;
- }
-
- if (failed)
- {
- stats.collection_failed++;
- }
-
- if (skipped)
- {
- stats.collection_skipped++;
- }
-
- world.shutdown(creators_ptr);
- Outn();
- }
-
- if (not signal.is_shutdown())
- {
- signal.set_shutdown(SHUTDOWN_GRACEFUL);
- }
-
- shutdown_t status= signal.get_shutdown();
- if (status == SHUTDOWN_FORCED)
- {
- Out << "Tests were aborted.";
- exit_code= EXIT_FAILURE;
- }
- else if (stats.collection_failed)
- {
- Out << "Some test failed.";
- exit_code= EXIT_FAILURE;
- }
- else if (stats.collection_skipped and stats.collection_failed and stats.collection_success)
- {
- Out << "Some tests were skipped.";
- }
- else if (stats.collection_success and stats.collection_failed == 0)
- {
- Out << "All tests completed successfully.";
- }
-
- stats_print(&stats);
-
- Outn(); // Generate a blank to break up the messages if make check/test has been run
- } while (exit_code == EXIT_SUCCESS and --opt_repeat);
- }
- catch (libtest::fatal& e)
- {
- std::cerr << e.what() << std::endl;
- }
- catch (std::exception& e)
- {
- std::cerr << e.what() << std::endl;
- }
- catch (...)
- {
- std::cerr << "Unknown exception halted execution." << std::endl;
- }
-
- return exit_code;
-}
|
|
[-]
[+]
|
Deleted |
libmemcached-1.0.6.tar.bz2/tests/output_plus.res
^
|
| @@ -1,5 +0,0 @@
-servers localhost:11221,
- localhost : 11221
-
-
-retvalue 1
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/COPYING
^
|
| @@ -1,7 +1,6 @@
Software License Agreement (BSD License)
-Copyright (c) 2011, Data Differential (http://datadifferential.com/)
-Copyright (c) 2007-2010, TangentOrg (Brian Aker)
+Copyright (c) 2012, Data Differential (http://datadifferential.com/)
All rights reserved.
Redistribution and use in source and binary forms, with or without
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/ChangeLog
^
|
| @@ -1,3 +1,7 @@
+1.0.7 Sat Apr 28 00:48:29 PDT 2012
+* Add API call for exist calls.
+* Update all license files to be BSD.
+
1.0.6 Sat Apr 7 18:26:49 PDT 2012
* Fixes for gcc 4.7, lp:961812
* Fix for restart issue that happens under testing.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/Makefile.am
^
|
| @@ -19,14 +19,15 @@
check_PROGRAMS =
EXTRA_HEADERS =
BUILT_SOURCES=
-EXTRA_DIST= \
- ${srcdir}/m4/pandora_*.m4 \
- .quickly \
- README.FIRST \
- README.win32 \
- config/autorun.sh \
- config/pandora-plugin \
- config/uncrustify.cfg
+EXTRA_DIST=
+
+EXTRA_DIST+= ${srcdir}/m4/pandora_*.m4
+EXTRA_DIST+= .quickly
+EXTRA_DIST+= README.FIRST
+EXTRA_DIST+= README.win32
+EXTRA_DIST+= config/autorun.sh
+EXTRA_DIST+= config/pandora-plugin
+EXTRA_DIST+= config/uncrustify.cfg
include libtest/include.am
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/Makefile.in
^
|
| @@ -18,22 +18,6 @@
# vim:ft=automake
# vim:ft=automake
-# Copyright (C) 2011 Data Differential, http://datadifferential.com/
-# All rights reserved.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# included from Top Level Makefile.am
# All paths should be given relative to the root
@@ -137,6 +121,10 @@
# All paths should be given relative to the root
# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+# vim:ft=automake
# Copyright (C) 2011 Data Differential
# All rights reserved.
#
@@ -305,38 +293,40 @@
@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_TRUE@am__append_9 = libtest/memcached.cc
@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_FALSE@am__append_10 = -DHAVE_LIBMEMCACHED=0
@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_FALSE@am__append_11 = -DHAVE_LIBMEMCACHED=0
-@BUILDING_GEARMAN_TRUE@am__append_12 = libgearman/libgearman.la
-@BUILDING_GEARMAN_TRUE@am__append_13 = libgearman/libgearman.la
-@BUILDING_GEARMAN_TRUE@am__append_14 = libtest/blobslap_worker.cc \
+@HAVE_LIBDRIZZLE_TRUE@am__append_12 = $(libdrizzle_LIBS)
+@HAVE_LIBDRIZZLE_TRUE@am__append_13 = $(libdrizzle_CFLAGS)
+@BUILDING_GEARMAN_TRUE@am__append_14 = libgearman/libgearman.la
+@BUILDING_GEARMAN_TRUE@am__append_15 = libgearman/libgearman.la
+@BUILDING_GEARMAN_TRUE@am__append_16 = libtest/blobslap_worker.cc \
@BUILDING_GEARMAN_TRUE@ libtest/gearmand.cc util/instance.cc \
@BUILDING_GEARMAN_TRUE@ util/operation.cc
-@BUILDING_GEARMAN_TRUE@am__append_15 = libgearman/libgearman.la
-@BUILDING_GEARMAN_TRUE@am__append_16 = libgearman/libgearman.la \
+@BUILDING_GEARMAN_TRUE@am__append_17 = libgearman/libgearman.la
+@BUILDING_GEARMAN_TRUE@am__append_18 = libgearman/libgearman.la \
@BUILDING_GEARMAN_TRUE@ gearmand/gearmand
-@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@am__append_17 = libgearman/libgearman.la
-@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@am__append_18 = $(libgearman_LIBS)
-@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@am__append_19 = libtest/blobslap_worker.cc \
+@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@am__append_19 = libgearman/libgearman.la
+@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@am__append_20 = $(libgearman_LIBS)
+@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@am__append_21 = libtest/blobslap_worker.cc \
@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@ libtest/gearmand.cc \
@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@ util/instance.cc \
@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@ util/operation.cc
-@HAVE_SASL_TRUE@am__append_20 = $(LIBSASL)
-@BUILD_MEMASLAP_TRUE@@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__append_21 = clients/memaslap
-@HAVE_LIBEVENT_TRUE@am__append_22 = example/memcached_light
-@INCLUDE_HSIEH_SRC_TRUE@am__append_23 = libhashkit/hsieh.cc
-@INCLUDE_HSIEH_SRC_FALSE@am__append_24 = libhashkit/nohsieh.cc
-@HAVE_SASL_TRUE@am__append_25 = $(LIBSASL_CPPFLAGS) $(PTHREAD_CFLAGS)
-@HAVE_SASL_TRUE@am__append_26 = $(PTHREAD_LIBS) $(LIBSASL_LDFLAGS)
-@HAVE_DTRACE_TRUE@am__append_27 = libmemcached/dtrace_probes.h
-@HAVE_DTRACE_TRUE@am__append_28 = libmemcached/dtrace_probes.h \
+@HAVE_SASL_TRUE@am__append_22 = $(LIBSASL)
+@BUILD_MEMASLAP_TRUE@@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__append_23 = clients/memaslap
+@HAVE_LIBEVENT_TRUE@am__append_24 = example/memcached_light
+@INCLUDE_HSIEH_SRC_TRUE@am__append_25 = libhashkit/hsieh.cc
+@INCLUDE_HSIEH_SRC_FALSE@am__append_26 = libhashkit/nohsieh.cc
+@HAVE_SASL_TRUE@am__append_27 = $(LIBSASL_CPPFLAGS) $(PTHREAD_CFLAGS)
+@HAVE_SASL_TRUE@am__append_28 = $(PTHREAD_LIBS) $(LIBSASL_LDFLAGS)
+@HAVE_DTRACE_TRUE@am__append_29 = libmemcached/dtrace_probes.h
+@HAVE_DTRACE_TRUE@am__append_30 = libmemcached/dtrace_probes.h \
@HAVE_DTRACE_TRUE@ libmemcached/libmemcached_probes.o
-@HAVE_DTRACE_TRUE@am__append_29 = libmemcached/libmemcached_probes.o
-@HAVE_DTRACE_TRUE@am__append_30 = libmemcached/libmemcached_probes.o
-@HAVE_DTRACE_TRUE@am__append_31 = libmemcached/libmemcached_probes.d
-@BUILD_POLL_TRUE@am__append_32 = poll/poll.c
-@BUILD_WIN32_WRAPPERS_TRUE@am__append_33 = -no-undefined
-@BUILD_WIN32_WRAPPERS_TRUE@am__append_34 = -no-undefined
+@HAVE_DTRACE_TRUE@am__append_31 = libmemcached/libmemcached_probes.o
+@HAVE_DTRACE_TRUE@am__append_32 = libmemcached/libmemcached_probes.o
+@HAVE_DTRACE_TRUE@am__append_33 = libmemcached/libmemcached_probes.d
+@BUILD_POLL_TRUE@am__append_34 = poll/poll.c
@BUILD_WIN32_WRAPPERS_TRUE@am__append_35 = -no-undefined
@BUILD_WIN32_WRAPPERS_TRUE@am__append_36 = -no-undefined
+@BUILD_WIN32_WRAPPERS_TRUE@am__append_37 = -no-undefined
+@BUILD_WIN32_WRAPPERS_TRUE@am__append_38 = -no-undefined
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_library.m4 \
@@ -642,7 +632,7 @@
$(CXXLD) $(libmemcached_libmemcachedutil_la_CXXFLAGS) \
$(CXXFLAGS) $(libmemcached_libmemcachedutil_la_LDFLAGS) \
$(LDFLAGS) -o $@
-am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(am__append_30)
+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(am__append_32)
am__libmemcachedinternal_libmemcachedinternal_la_SOURCES_DIST = \
libmemcached/csl/context.cc libmemcached/csl/parser.cc \
libmemcached/csl/scanner.cc libhashkit/aes.cc \
@@ -781,12 +771,13 @@
am__libtest_libtest_la_SOURCES_DIST = libtest/binaries.cc \
libtest/cmdline.cc libtest/comparison.cc libtest/core.cc \
libtest/cpu.cc libtest/dream.cc libtest/fatal.cc \
- libtest/framework.cc libtest/has.cc libtest/http.cc \
- libtest/is_local.cc libtest/killpid.cc libtest/libtool.cc \
- libtest/port.cc libtest/runner.cc libtest/server.cc \
+ libtest/framework.cc libtest/has.cc libtest/drizzled.cc \
+ libtest/http.cc libtest/is_local.cc libtest/killpid.cc \
+ libtest/libtool.cc libtest/main.cc libtest/port.cc \
+ libtest/runner.cc libtest/server.cc \
libtest/server_container.cc libtest/signal.cc \
- libtest/socket.cc libtest/strerror.cc libtest/test.cc \
- libtest/tmpfile.cc libtest/vchar.cc libtest/memcached.cc \
+ libtest/socket.cc libtest/strerror.cc libtest/tmpfile.cc \
+ libtest/vchar.cc libtest/memcached.cc \
libtest/blobslap_worker.cc libtest/gearmand.cc \
util/instance.cc util/operation.cc
@BUILDING_LIBMEMCACHED_TRUE@am__objects_17 = libtest/libtest_libtest_la-memcached.lo
@@ -809,10 +800,12 @@
libtest/libtest_libtest_la-fatal.lo \
libtest/libtest_libtest_la-framework.lo \
libtest/libtest_libtest_la-has.lo \
+ libtest/libtest_libtest_la-drizzled.lo \
libtest/libtest_libtest_la-http.lo \
libtest/libtest_libtest_la-is_local.lo \
libtest/libtest_libtest_la-killpid.lo \
libtest/libtest_libtest_la-libtool.lo \
+ libtest/libtest_libtest_la-main.lo \
libtest/libtest_libtest_la-port.lo \
libtest/libtest_libtest_la-runner.lo \
libtest/libtest_libtest_la-server.lo \
@@ -820,7 +813,6 @@
libtest/libtest_libtest_la-signal.lo \
libtest/libtest_libtest_la-socket.lo \
libtest/libtest_libtest_la-strerror.lo \
- libtest/libtest_libtest_la-test.lo \
libtest/libtest_libtest_la-tmpfile.lo \
libtest/libtest_libtest_la-vchar.lo $(am__objects_17) \
$(am__objects_18) $(am__objects_19) $(am__objects_20)
@@ -901,6 +893,7 @@
am_example_t_memcached_light_OBJECTS = \
example/t/example_t_memcached_light-memcached_light.$(OBJEXT) \
tests/libmemcached-1.0/example_t_memcached_light-memcached_get.$(OBJEXT) \
+ tests/libmemcached-1.0/example_t_memcached_light-print.$(OBJEXT) \
tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.$(OBJEXT)
example_t_memcached_light_OBJECTS = \
$(am_example_t_memcached_light_OBJECTS)
@@ -955,18 +948,27 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(memcached_memcached_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-am_tests_atomsmasher_OBJECTS = \
+am_tests_atomsmasher_OBJECTS = clients/execute.$(OBJEXT) \
+ clients/generator.$(OBJEXT) \
tests/libmemcached-1.0/atomsmasher.$(OBJEXT) \
+ tests/libmemcached-1.0/callback_counter.$(OBJEXT) \
tests/libmemcached-1.0/debug.$(OBJEXT) \
- tests/libmemcached-1.0/print.$(OBJEXT) \
- clients/generator.$(OBJEXT) clients/execute.$(OBJEXT)
+ tests/libmemcached-1.0/fetch_all_results.$(OBJEXT) \
+ tests/libmemcached-1.0/generate.$(OBJEXT) \
+ tests/libmemcached-1.0/print.$(OBJEXT)
tests_atomsmasher_OBJECTS = $(am_tests_atomsmasher_OBJECTS)
am_tests_cycle_OBJECTS = tests/tests_cycle-cycle.$(OBJEXT)
tests_cycle_OBJECTS = $(am_tests_cycle_OBJECTS)
tests_cycle_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(tests_cycle_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_tests_failure_OBJECTS = tests/tests_failure-failure.$(OBJEXT)
+am_tests_failure_OBJECTS = tests/tests_failure-failure.$(OBJEXT) \
+ clients/tests_failure-execute.$(OBJEXT) \
+ clients/tests_failure-generator.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_failure-callback_counter.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_failure-fetch_all_results.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_failure-generate.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_failure-print.$(OBJEXT)
tests_failure_OBJECTS = $(am_tests_failure_OBJECTS)
tests_failure_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -999,15 +1001,21 @@
tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-replication.$(OBJEXT) \
tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-sasl.$(OBJEXT) \
tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-virtual_buckets.$(OBJEXT) \
+ clients/tests_libmemcached_1_0_sasl-execute.$(OBJEXT) \
clients/tests_libmemcached_1_0_sasl-generator.$(OBJEXT) \
- clients/tests_libmemcached_1_0_sasl-execute.$(OBJEXT)
+ tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.$(OBJEXT)
tests_libmemcached_1_0_sasl_OBJECTS = \
$(am_tests_libmemcached_1_0_sasl_OBJECTS)
tests_libmemcached_1_0_sasl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_tests_libmemcached_1_0_testapp_OBJECTS = tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-all_tests.$(OBJEXT) \
+am_tests_libmemcached_1_0_testapp_OBJECTS = \
+ clients/tests_libmemcached_1_0_testapp-generator.$(OBJEXT) \
+ clients/tests_libmemcached_1_0_testapp-execute.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-all_tests.$(OBJEXT) \
tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-basic.$(OBJEXT) \
tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-callback_counter.$(OBJEXT) \
tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-callbacks.$(OBJEXT) \
@@ -1032,16 +1040,17 @@
tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-setup_and_teardowns.$(OBJEXT) \
tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-stat.$(OBJEXT) \
tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-touch.$(OBJEXT) \
- tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-virtual_buckets.$(OBJEXT) \
- clients/tests_libmemcached_1_0_testapp-generator.$(OBJEXT) \
- clients/tests_libmemcached_1_0_testapp-execute.$(OBJEXT)
+ tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-virtual_buckets.$(OBJEXT)
tests_libmemcached_1_0_testapp_OBJECTS = \
$(am_tests_libmemcached_1_0_testapp_OBJECTS)
tests_libmemcached_1_0_testapp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_tests_libmemcached_1_0_testsocket_OBJECTS = tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-all_tests_socket.$(OBJEXT) \
+am_tests_libmemcached_1_0_testsocket_OBJECTS = \
+ clients/tests_libmemcached_1_0_testsocket-execute.$(OBJEXT) \
+ clients/tests_libmemcached_1_0_testsocket-generator.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-all_tests_socket.$(OBJEXT) \
tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-basic.$(OBJEXT) \
tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-callback_counter.$(OBJEXT) \
tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-callbacks.$(OBJEXT) \
@@ -1066,9 +1075,7 @@
tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-setup_and_teardowns.$(OBJEXT) \
tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-stat.$(OBJEXT) \
tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-touch.$(OBJEXT) \
- tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-virtual_buckets.$(OBJEXT) \
- clients/tests_libmemcached_1_0_testsocket-generator.$(OBJEXT) \
- clients/tests_libmemcached_1_0_testsocket-execute.$(OBJEXT)
+ tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-virtual_buckets.$(OBJEXT)
tests_libmemcached_1_0_testsocket_OBJECTS = \
$(am_tests_libmemcached_1_0_testsocket_OBJECTS)
tests_libmemcached_1_0_testsocket_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -1141,14 +1148,24 @@
$(LDFLAGS) -o $@
am_tests_testhashkit_OBJECTS = tests/hashkit_functions.$(OBJEXT)
tests_testhashkit_OBJECTS = $(am_tests_testhashkit_OBJECTS)
-am_tests_testplus_OBJECTS = \
- tests/libmemcached-1.0/tests_testplus-plus.$(OBJEXT)
+am_tests_testplus_OBJECTS = clients/tests_testplus-execute.$(OBJEXT) \
+ clients/tests_testplus-generator.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_testplus-callback_counter.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_testplus-fetch_all_results.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_testplus-generate.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_testplus-plus.$(OBJEXT) \
+ tests/libmemcached-1.0/tests_testplus-print.$(OBJEXT)
tests_testplus_OBJECTS = $(am_tests_testplus_OBJECTS)
tests_testplus_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_testplus_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-am_tests_testudp_OBJECTS = tests/mem_udp.$(OBJEXT)
+am_tests_testudp_OBJECTS = clients/execute.$(OBJEXT) \
+ clients/generator.$(OBJEXT) \
+ tests/libmemcached-1.0/callback_counter.$(OBJEXT) \
+ tests/libmemcached-1.0/fetch_all_results.$(OBJEXT) \
+ tests/libmemcached-1.0/generate.$(OBJEXT) \
+ tests/libmemcached-1.0/print.$(OBJEXT) tests/mem_udp.$(OBJEXT)
tests_testudp_OBJECTS = $(am_tests_testudp_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -1482,8 +1499,8 @@
# includes append to these:
SUFFIXES = .d
.PHONY =
-CLEANFILES = tmp_chroot/var/log/* tmp_chroot/var/run/* \
- tmp_chroot/var/tmp/* $(am__append_28)
+CLEANFILES = tmp_chroot/var/drizzle/* tmp_chroot/var/log/* \
+ tmp_chroot/var/run/* tmp_chroot/var/tmp/* $(am__append_30)
DISTCLEANFILES = libmemcached/csl/parser.output config/top.h
# vim:ft=automake
@@ -1498,33 +1515,33 @@
libtest/cmdline.h libtest/collection.h libtest/common.h \
libtest/comparison.hpp libtest/core.h libtest/dream.h \
libtest/error.h libtest/failed.h libtest/fatal.hpp \
- libtest/framework.h libtest/gearmand.h libtest/get.h \
- libtest/has.hpp libtest/http.hpp libtest/is_pid.hpp \
- libtest/is_local.hpp libtest/killpid.h libtest/libtool.hpp \
- libtest/memcached.h libtest/port.h libtest/runner.h \
- libtest/server.h libtest/server_container.h libtest/signal.h \
- libtest/socket.hpp libtest/stats.h libtest/stream.h \
- libtest/strerror.h libtest/string.hpp libtest/test.h \
- libtest/test.hpp libtest/tmpfile.hpp libtest/vchar.hpp \
- libtest/visibility.h libtest/wait.h clients/client_options.h \
- clients/execute.h clients/generator.h clients/ms_atomic.h \
- clients/ms_conn.h clients/ms_memslap.h clients/ms_setting.h \
- clients/ms_sigsegv.h clients/ms_stats.h clients/ms_task.h \
- clients/ms_thread.h clients/utilities.h example/byteorder.h \
- example/memcached_light.h example/storage.h libhashkit/aes.h \
- libhashkit/common.h libhashkit/is.h libhashkit/rijndael.hpp \
- libhashkit/string.h libmemcached/csl/common.h \
- libmemcached/csl/context.h libmemcached/csl/parser.h \
- libmemcached/csl/scanner.h libmemcached/csl/server.h \
- libmemcached/csl/symbol.h libmemcached/array.h \
- libmemcached/assert.hpp libmemcached/backtrace.hpp \
- libmemcached/byteorder.h libmemcached/common.h \
- libmemcached/connect.hpp libmemcached/continuum.hpp \
- libmemcached/do.hpp libmemcached/encoding_key.h \
- libmemcached/error.hpp libmemcached/initialize_query.h \
- libmemcached/internal.h libmemcached/io.h libmemcached/io.hpp \
- libmemcached/is.h libmemcached/key.hpp \
- libmemcached/libmemcached_probes.h \
+ libtest/framework.h libtest/gearmand.h libtest/drizzled.h \
+ libtest/get.h libtest/has.hpp libtest/http.hpp \
+ libtest/is_pid.hpp libtest/is_local.hpp libtest/killpid.h \
+ libtest/libtool.hpp libtest/memcached.h libtest/port.h \
+ libtest/runner.h libtest/server.h libtest/server_container.h \
+ libtest/signal.h libtest/socket.hpp libtest/stats.h \
+ libtest/stream.h libtest/strerror.h libtest/string.hpp \
+ libtest/test.h libtest/test.hpp libtest/tmpfile.hpp \
+ libtest/vchar.hpp libtest/visibility.h libtest/wait.h \
+ clients/client_options.h clients/execute.h clients/generator.h \
+ clients/ms_atomic.h clients/ms_conn.h clients/ms_memslap.h \
+ clients/ms_setting.h clients/ms_sigsegv.h clients/ms_stats.h \
+ clients/ms_task.h clients/ms_thread.h clients/utilities.h \
+ example/byteorder.h example/memcached_light.h \
+ example/storage.h libhashkit/aes.h libhashkit/common.h \
+ libhashkit/is.h libhashkit/rijndael.hpp libhashkit/string.h \
+ libmemcached/csl/common.h libmemcached/csl/context.h \
+ libmemcached/csl/parser.h libmemcached/csl/scanner.h \
+ libmemcached/csl/server.h libmemcached/csl/symbol.h \
+ libmemcached/array.h libmemcached/assert.hpp \
+ libmemcached/backtrace.hpp libmemcached/byteorder.h \
+ libmemcached/common.h libmemcached/connect.hpp \
+ libmemcached/continuum.hpp libmemcached/do.hpp \
+ libmemcached/encoding_key.h libmemcached/error.hpp \
+ libmemcached/initialize_query.h libmemcached/internal.h \
+ libmemcached/io.h libmemcached/io.hpp libmemcached/is.h \
+ libmemcached/key.hpp libmemcached/libmemcached_probes.h \
libmemcached/memcached/protocol_binary.h \
libmemcached/memcached/vbucket.h libmemcached/memory.h \
libmemcached/namespace.h libmemcached/options.hpp \
@@ -1536,8 +1553,9 @@
libmemcachedutil/common.h libmemcachedprotocol/ascii_handler.h \
libmemcachedprotocol/binary_handler.h \
libmemcachedprotocol/cache.h libmemcachedprotocol/common.h \
- poll/poll.h tests/exist.h tests/keys.hpp tests/hash_results.h \
- tests/libmemcached_world.h tests/libmemcached_world_socket.h \
+ poll/poll.h tests/exist.h tests/hash_results.h tests/keys.hpp \
+ tests/libmemcached_test_container.h tests/libmemcached_world.h \
+ tests/libmemcached_world_socket.h tests/memc.h tests/runner.h \
tests/basic.h tests/callbacks.h tests/debug.h \
tests/deprecated.h tests/error_conditions.h tests/exist.h \
tests/ketama.h tests/ketama_test_cases.h \
@@ -1715,15 +1733,16 @@
libmemcached/memcached.h libmemcached/memcached.hpp \
libmemcached/util.h
EXTRA_HEADERS =
-BUILT_SOURCES = $(am__append_27)
+BUILT_SOURCES = $(am__append_29)
EXTRA_DIST = ${srcdir}/m4/pandora_*.m4 .quickly README.FIRST \
README.win32 config/autorun.sh config/pandora-plugin \
config/uncrustify.cfg libtest/run.gdb \
libhashkit-1.0/configure.h.in libmemcached-1.0/configure.h.in \
+ libmemcached/csl/parser.yy libmemcached/csl/scanner.l \
libmemcached/libmemcached_probes.d \
libmemcached/memcached/README.txt support/libmemcached.spec \
support/libmemcached-fc.spec.in support/set_benchmark.sh \
- tests/cpp_example.cc tests/output_plus.res ${man_MANS}
+ tests/cpp_example.cc ${man_MANS}
LIBTOOL_COMMAND = ${abs_top_builddir}/libtool --mode=execute
VALGRIND_EXEC_COMMAND = $(LIBTOOL_COMMAND) valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
VALGRIND_COMMAND = TESTS_ENVIRONMENT="valgrind" $(VALGRIND_EXEC_COMMAND)
@@ -1731,31 +1750,31 @@
DRD_COMMAND = $(LIBTOOL_COMMAND) valgrind --tool=drd
GDB_COMMAND = $(LIBTOOL_COMMAND) gdb -f -x libtest/run.gdb
PTRCHECK_COMMAND = $(LIBTOOL_COMMAND) valgrind --tool=exp-ptrcheck --error-exitcode=1
+libtest_libtest_la_CXXFLAGS = -DBUILDING_LIBTEST $(PTHREAD_CFLAGS) \
+ -DLIBTEST_TEMP="\"tmp_chroot\"" $(CURL_CFLAGS) $(am__append_4) \
+ $(am__append_10) $(am__append_13)
+libtest_libtest_la_DEPENDENCIES = libtest_tmp_dir libtest/abort \
+ libtest/wait $(am__append_1) $(am__append_14) $(am__append_19) \
+ memcached/memcached
+libtest_libtest_la_LIBADD = $(PTHREAD_LIBS) $(CURL_LIBS) \
+ $(am__append_2) $(am__append_8) $(am__append_12) \
+ $(am__append_15) $(am__append_20)
libtest_libtest_la_SOURCES = libtest/binaries.cc libtest/cmdline.cc \
libtest/comparison.cc libtest/core.cc libtest/cpu.cc \
libtest/dream.cc libtest/fatal.cc libtest/framework.cc \
- libtest/has.cc libtest/http.cc libtest/is_local.cc \
- libtest/killpid.cc libtest/libtool.cc libtest/port.cc \
- libtest/runner.cc libtest/server.cc \
- libtest/server_container.cc libtest/signal.cc \
- libtest/socket.cc libtest/strerror.cc libtest/test.cc \
+ libtest/has.cc libtest/drizzled.cc libtest/http.cc \
+ libtest/is_local.cc libtest/killpid.cc libtest/libtool.cc \
+ libtest/main.cc libtest/port.cc libtest/runner.cc \
+ libtest/server.cc libtest/server_container.cc \
+ libtest/signal.cc libtest/socket.cc libtest/strerror.cc \
libtest/tmpfile.cc libtest/vchar.cc $(am__append_3) \
- $(am__append_9) $(am__append_14) $(am__append_19)
-libtest_libtest_la_CXXFLAGS = ${NO_CONVERSION} -DBUILDING_LIBTEST \
- $(PTHREAD_CFLAGS) -DLIBTEST_TEMP="\"tmp_chroot\"" \
- $(CURL_CFLAGS) $(am__append_4) $(am__append_10)
-libtest_libtest_la_DEPENDENCIES = libtest_tmp_dir libtest/abort \
- libtest/wait $(am__append_1) $(am__append_12) $(am__append_17) \
- memcached/memcached
-libtest_libtest_la_LIBADD = $(PTHREAD_LIBS) $(CURL_LIBS) \
- $(am__append_2) $(am__append_8) $(am__append_13) \
- $(am__append_18)
+ $(am__append_9) $(am__append_16) $(am__append_21)
# Declare unittest so that we can append to it
libtest_unittest_CXXFLAGS = $(am__append_5) $(am__append_11)
-libtest_unittest_LDADD = $(am__append_6) $(am__append_15) \
+libtest_unittest_LDADD = $(am__append_6) $(am__append_17) \
libtest/libtest.la
-libtest_unittest_DEPENDENCIES = $(am__append_7) $(am__append_16) \
+libtest_unittest_DEPENDENCIES = $(am__append_7) $(am__append_18) \
libtest/libtest.la
libtest_unittest_SOURCES = libtest/unittest.cc
libtest_skiptest_LDADD = libtest/libtest.la
@@ -1779,7 +1798,7 @@
libmemcached_1_0_t_c_sasl_test_LDADD = libmemcached/libmemcached.la
libmemcached_1_0_t_c_sasl_test_DEPENDENCIES = libmemcached/libmemcached.la
CLIENTS_LDADDS = clients/libutilities.la libmemcached/libmemcached.la \
- $(am__append_20)
+ $(am__append_22)
clients_libutilities_la_SOURCES = clients/utilities.cc
clients_memcat_SOURCES = clients/memcat.cc
clients_memcat_LDADD = $(CLIENTS_LDADDS)
@@ -1839,6 +1858,7 @@
example_t_memcached_light_SOURCES = example/t/memcached_light.cc \
tests/libmemcached-1.0/memcached_get.cc \
+ tests/libmemcached-1.0/print.cc \
tests/libmemcached-1.0/setup_and_teardowns.cc
example_t_memcached_light_LDADD = $(MEMCACHED_LIGHT_TESTS_LDADDS) \
$(LIBUUID_LDFLAGS)
@@ -1852,12 +1872,12 @@
libhashkit/jenkins.cc libhashkit/ketama.cc libhashkit/md5.cc \
libhashkit/murmur.cc libhashkit/one_at_a_time.cc \
libhashkit/rijndael.cc libhashkit/str_algorithm.cc \
- libhashkit/strerror.cc libhashkit/string.cc $(am__append_23) \
- $(am__append_24)
+ libhashkit/strerror.cc libhashkit/string.cc $(am__append_25) \
+ $(am__append_26)
libhashkit_libhashkit_la_CXXFLAGS = -DBUILDING_HASHKIT
libhashkit_libhashkit_la_LIBADD =
libhashkit_libhashkit_la_LDFLAGS = -version-info \
- $(HASHKIT_LIBRARY_VERSION) $(am__append_33)
+ $(HASHKIT_LIBRARY_VERSION) $(am__append_35)
libhashkit_libhashkitinc_la_SOURCES = ${libhashkit_libhashkit_la_SOURCES}
libhashkit_libhashkitinc_la_CFLAGS = ${libhashkit_libhashkit_la_CFLAGS}
libhashkit_libhashkitinc_la_LDFLAGS = $(LIBM)
@@ -1887,16 +1907,16 @@
libmemcached/strerror.cc libmemcached/string.cc \
libmemcached/touch.cc libmemcached/verbosity.cc \
libmemcached/version.cc libmemcached/udp.cc \
- libmemcached/virtual_bucket.c $(am__append_31) \
- $(am__append_32)
+ libmemcached/virtual_bucket.c $(am__append_33) \
+ $(am__append_34)
libmemcached_libmemcached_la_CFLAGS = -DBUILDING_LIBMEMCACHED
libmemcached_libmemcached_la_CXXFLAGS = -DBUILDING_LIBMEMCACHED \
- $(am__append_25)
-libmemcached_libmemcached_la_DEPENDENCIES = $(am__append_29)
-libmemcached_libmemcached_la_LIBADD = $(am__append_26) \
- $(am__append_30)
+ $(am__append_27)
+libmemcached_libmemcached_la_DEPENDENCIES = $(am__append_31)
+libmemcached_libmemcached_la_LIBADD = $(am__append_28) \
+ $(am__append_32)
libmemcached_libmemcached_la_LDFLAGS = -version-info \
- ${MEMCACHED_LIBRARY_VERSION} $(am__append_34)
+ ${MEMCACHED_LIBRARY_VERSION} $(am__append_36)
libmemcached_libmemcachedutil_la_SOURCES = \
libmemcached/backtrace.cc \
libmemcachedutil/flush.cc \
@@ -1910,7 +1930,7 @@
libmemcached_libmemcachedutil_la_LIBADD = \
libmemcached/libmemcached.la ${PTHREAD_LIBS}
libmemcached_libmemcachedutil_la_LDFLAGS = ${AM_LDFLAGS} -version-info \
- ${MEMCACHED_UTIL_LIBRARY_VERSION} $(am__append_36)
+ ${MEMCACHED_UTIL_LIBRARY_VERSION} $(am__append_38)
libmemcached_libmemcachedutil_la_DEPENDENCIES = libmemcached/libmemcached.la
libmemcached_libmemcachedprotocol_la_SOURCES = \
libmemcached/byteorder.cc \
@@ -1927,7 +1947,7 @@
libmemcached_libmemcachedprotocol_la_LIBADD = ${PTHREAD_LIBS}
libmemcached_libmemcachedprotocol_la_LDFLAGS = ${AM_LDFLAGS} \
-version-info ${MEMCACHED_PROTOCAL_LIBRARY_VERSION} \
- $(am__append_35)
+ $(am__append_37)
libmemcachedinternal_libmemcachedinternal_la_SOURCES = $(libmemcached_libmemcached_la_SOURCES)
libmemcachedinternal_libmemcachedinternal_la_CFLAGS = \
${AM_CFLAGS} \
@@ -1968,19 +1988,25 @@
tests_cycle_LDADD = $(tests_cycle_DEPENDENCIES) ${PTHREAD_LIBS}
# Test internals
-tests_libmemcached_1_0_internals_SOURCES = \
- tests/libmemcached-1.0/internals.cc \
- tests/libmemcached-1.0/string.cc
-tests_libmemcached_1_0_internals_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
-tests_libmemcached_1_0_internals_DEPENDENCIES = libmemcachedinternal/libmemcachedinternal.la libtest/libtest.la libmemcachedinternal/libmemcachedutilinternal.la
+tests_libmemcached_1_0_internals_CXXFLAGS = $(AM_CXXFLAGS) \
+ ${PTHREAD_CFLAGS}
+tests_libmemcached_1_0_internals_DEPENDENCIES = \
+ libmemcachedinternal/libmemcachedinternal.la \
+ libtest/libtest.la \
+ libmemcachedinternal/libmemcachedutilinternal.la
tests_libmemcached_1_0_internals_LDADD = \
libmemcachedinternal/libmemcachedinternal.la ${PTHREAD_LIBS} \
libmemcachedinternal/libmemcachedutilinternal.la \
libtest/libtest.la
-tests_libmemcached_1_0_testapp_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
-tests_libmemcached_1_0_testapp_CFLAGS = $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
-tests_libmemcached_1_0_testapp_SOURCES = \
- tests/libmemcached-1.0/all_tests.cc \
+tests_libmemcached_1_0_internals_SOURCES = \
+ tests/libmemcached-1.0/internals.cc \
+ tests/libmemcached-1.0/string.cc
+tests_libmemcached_1_0_testapp_CXXFLAGS = $(AM_CXXFLAGS) \
+ ${PTHREAD_CFLAGS}
+tests_libmemcached_1_0_testapp_CFLAGS = $(AM_CFLAGS) $(NO_CONVERSION) \
+ $(NO_STRICT_ALIASING)
+tests_libmemcached_1_0_testapp_SOURCES = clients/generator.cc \
+ clients/execute.cc tests/libmemcached-1.0/all_tests.cc \
tests/libmemcached-1.0/basic.cc \
tests/libmemcached-1.0/callback_counter.cc \
tests/libmemcached-1.0/callbacks.cc \
@@ -2003,25 +2029,20 @@
tests/libmemcached-1.0/server_add.cc \
tests/libmemcached-1.0/setup_and_teardowns.cc \
tests/libmemcached-1.0/stat.cc tests/libmemcached-1.0/touch.cc \
- tests/libmemcached-1.0/virtual_buckets.cc clients/generator.cc \
- clients/execute.cc
-tests_libmemcached_1_0_testapp_DEPENDENCIES = \
- libmemcached/libmemcached.la \
- libtest/libtest.la \
- libhashkit/libhashkit.la \
- libmemcached/libmemcachedutil.la
-
-tests_libmemcached_1_0_testapp_LDADD = \
- $(LIBUUID_LDFLAGS) \
- ${PTHREAD_LIBS} \
- libmemcached/libmemcached.la \
- libmemcached/libmemcachedutil.la \
- libtest/libtest.la \
- libhashkit/libhashkit.la
-
-tests_libmemcached_1_0_testsocket_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
-tests_libmemcached_1_0_testsocket_CFLAGS = $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
-tests_libmemcached_1_0_testsocket_SOURCES = \
+ tests/libmemcached-1.0/virtual_buckets.cc
+tests_libmemcached_1_0_testapp_DEPENDENCIES = \
+ libmemcached/libmemcached.la libtest/libtest.la \
+ libhashkit/libhashkit.la libmemcached/libmemcachedutil.la
+tests_libmemcached_1_0_testapp_LDADD = $(LIBUUID_LDFLAGS) \
+ ${PTHREAD_LIBS} libmemcached/libmemcached.la \
+ libmemcached/libmemcachedutil.la libtest/libtest.la \
+ libhashkit/libhashkit.la
+tests_libmemcached_1_0_testsocket_CXXFLAGS = ${PTHREAD_CFLAGS} \
+ $(AM_CXXFLAGS)
+tests_libmemcached_1_0_testsocket_CFLAGS = $(AM_CFLAGS) \
+ $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+tests_libmemcached_1_0_testsocket_SOURCES = clients/execute.cc \
+ clients/generator.cc \
tests/libmemcached-1.0/all_tests_socket.cc \
tests/libmemcached-1.0/basic.cc \
tests/libmemcached-1.0/callback_counter.cc \
@@ -2045,24 +2066,14 @@
tests/libmemcached-1.0/server_add.cc \
tests/libmemcached-1.0/setup_and_teardowns.cc \
tests/libmemcached-1.0/stat.cc tests/libmemcached-1.0/touch.cc \
- tests/libmemcached-1.0/virtual_buckets.cc clients/generator.cc \
- clients/execute.cc
-tests_libmemcached_1_0_testsocket_DEPENDENCIES = \
- libmemcached/libmemcached.la \
- libtest/libtest.la \
- libhashkit/libhashkit.la \
- libmemcached/libmemcachedutil.la
-
-tests_libmemcached_1_0_testsocket_LDADD = \
- $(LIBUUID_LDFLAGS) \
- ${PTHREAD_LIBS} \
- libmemcached/libmemcached.la \
- libmemcached/libmemcachedutil.la \
- libtest/libtest.la \
- libhashkit/libhashkit.la
-
-tests_libmemcached_1_0_sasl_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
-tests_libmemcached_1_0_sasl_CFLAGS = $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+ tests/libmemcached-1.0/virtual_buckets.cc
+tests_libmemcached_1_0_testsocket_DEPENDENCIES = \
+ libmemcached/libmemcached.la libtest/libtest.la \
+ libhashkit/libhashkit.la libmemcached/libmemcachedutil.la
+tests_libmemcached_1_0_testsocket_LDADD = $(LIBUUID_LDFLAGS) \
+ ${PTHREAD_LIBS} libmemcached/libmemcached.la \
+ libmemcached/libmemcachedutil.la libtest/libtest.la \
+ libhashkit/libhashkit.la
tests_libmemcached_1_0_sasl_SOURCES = tests/libmemcached-1.0/basic.cc \
tests/libmemcached-1.0/debug.cc \
tests/libmemcached-1.0/deprecated.cc \
@@ -2073,37 +2084,53 @@
tests/libmemcached-1.0/pool.cc tests/libmemcached-1.0/print.cc \
tests/libmemcached-1.0/replication.cc \
tests/libmemcached-1.0/sasl.cc \
- tests/libmemcached-1.0/virtual_buckets.cc clients/generator.cc \
- clients/execute.cc
-tests_libmemcached_1_0_sasl_DEPENDENCIES = \
- libmemcached/libmemcached.la \
- libtest/libtest.la
-
-tests_libmemcached_1_0_sasl_LDADD = \
- ${PTHREAD_LIBS} \
- libmemcached/libmemcached.la \
- libmemcached/libmemcachedutil.la \
- libtest/libtest.la \
- libhashkit/libhashkit.la
-
-tests_atomsmasher_SOURCES = \
- tests/libmemcached-1.0/atomsmasher.cc \
- tests/libmemcached-1.0/debug.cc \
- tests/libmemcached-1.0/print.cc \
- clients/generator.cc \
- clients/execute.cc
-
+ tests/libmemcached-1.0/virtual_buckets.cc clients/execute.cc \
+ clients/generator.cc \
+ tests/libmemcached-1.0/callback_counter.cc \
+ tests/libmemcached-1.0/fetch_all_results.cc \
+ tests/libmemcached-1.0/generate.cc
+tests_libmemcached_1_0_sasl_DEPENDENCIES = \
+ libmemcached/libmemcached.la libtest/libtest.la
+tests_libmemcached_1_0_sasl_LDADD = ${PTHREAD_LIBS} \
+ libmemcached/libmemcached.la libmemcached/libmemcachedutil.la \
+ libtest/libtest.la libhashkit/libhashkit.la
+tests_libmemcached_1_0_sasl_CXXFLAGS = $(AM_CXXFLAGS) \
+ ${PTHREAD_CFLAGS}
+tests_libmemcached_1_0_sasl_CFLAGS = $(AM_CFLAGS) $(NO_CONVERSION) \
+ $(NO_STRICT_ALIASING)
+tests_atomsmasher_SOURCES = clients/execute.cc clients/generator.cc \
+ tests/libmemcached-1.0/atomsmasher.cc \
+ tests/libmemcached-1.0/callback_counter.cc \
+ tests/libmemcached-1.0/debug.cc \
+ tests/libmemcached-1.0/fetch_all_results.cc \
+ tests/libmemcached-1.0/generate.cc \
+ tests/libmemcached-1.0/print.cc
tests_atomsmasher_DEPENDENCIES = $(TESTS_LDADDS)
tests_atomsmasher_LDADD = $(tests_atomsmasher_DEPENDENCIES)
-tests_testudp_CFLAGS = $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
-tests_testudp_SOURCES = tests/mem_udp.cc
+tests_testudp_CFLAGS = $(AM_CFLAGS) $(NO_CONVERSION) \
+ $(NO_STRICT_ALIASING)
+tests_testudp_SOURCES = clients/execute.cc clients/generator.cc \
+ tests/libmemcached-1.0/callback_counter.cc \
+ tests/libmemcached-1.0/fetch_all_results.cc \
+ tests/libmemcached-1.0/generate.cc \
+ tests/libmemcached-1.0/print.cc tests/mem_udp.cc
tests_testudp_DEPENDENCIES = $(TESTS_LDADDS)
tests_testudp_LDADD = $(tests_testudp_DEPENDENCIES)
-tests_testplus_SOURCES = tests/libmemcached-1.0/plus.cpp
+tests_testplus_SOURCES = clients/execute.cc clients/generator.cc \
+ tests/libmemcached-1.0/callback_counter.cc \
+ tests/libmemcached-1.0/fetch_all_results.cc \
+ tests/libmemcached-1.0/generate.cc \
+ tests/libmemcached-1.0/plus.cpp \
+ tests/libmemcached-1.0/print.cc
tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
tests_testplus_DEPENDENCIES = $(TESTS_LDADDS)
tests_testplus_LDADD = $(tests_testplus_DEPENDENCIES)
-tests_failure_SOURCES = tests/failure.cc
+tests_failure_SOURCES = tests/failure.cc clients/execute.cc \
+ clients/generator.cc \
+ tests/libmemcached-1.0/callback_counter.cc \
+ tests/libmemcached-1.0/fetch_all_results.cc \
+ tests/libmemcached-1.0/generate.cc \
+ tests/libmemcached-1.0/print.cc
tests_failure_CXXFLAGS = $(AM_CXXFLAGS)
tests_failure_DEPENDENCIES = $(TESTS_LDADDS)
tests_failure_LDADD = $(tests_failure_DEPENDENCIES)
@@ -2158,14 +2185,13 @@
tests_memdump_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
tests_memdump_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS) clients/memdump
tests_memdump_LDADD = libtest/libtest.la $(TESTS_LDADDS)
+memcached_memcached_CFLAGS = ${PTHREAD_CFLAGS} -DHAVE_CONFIG_H \
+ -std=c99
+memcached_memcached_LDADD = $(LIBEVENT_LDFLAGS) ${PTHREAD_LIBS}
memcached_memcached_SOURCES = memcached/assoc.c memcached/cache.c \
memcached/daemon.c memcached/hash.c memcached/items.c \
memcached/memcached.c memcached/slabs.c memcached/stats.c \
memcached/thread.c memcached/trace.h memcached/util.c
-memcached_memcached_CFLAGS = -DHAVE_CONFIG_H -std=c99 \
- ${PTHREAD_CFLAGS} -DRMEMCACHED_VERSION="\"1.4.13\"" \
- -DRMEMCACHED_PACKAGE="\"memcached\""
-memcached_memcached_LDADD = $(LIBEVENT_LDFLAGS) ${PTHREAD_LIBS}
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -2949,6 +2975,8 @@
libtest/$(DEPDIR)/$(am__dirstamp)
libtest/libtest_libtest_la-has.lo: libtest/$(am__dirstamp) \
libtest/$(DEPDIR)/$(am__dirstamp)
+libtest/libtest_libtest_la-drizzled.lo: libtest/$(am__dirstamp) \
+ libtest/$(DEPDIR)/$(am__dirstamp)
libtest/libtest_libtest_la-http.lo: libtest/$(am__dirstamp) \
libtest/$(DEPDIR)/$(am__dirstamp)
libtest/libtest_libtest_la-is_local.lo: libtest/$(am__dirstamp) \
@@ -2957,6 +2985,8 @@
libtest/$(DEPDIR)/$(am__dirstamp)
libtest/libtest_libtest_la-libtool.lo: libtest/$(am__dirstamp) \
libtest/$(DEPDIR)/$(am__dirstamp)
+libtest/libtest_libtest_la-main.lo: libtest/$(am__dirstamp) \
+ libtest/$(DEPDIR)/$(am__dirstamp)
libtest/libtest_libtest_la-port.lo: libtest/$(am__dirstamp) \
libtest/$(DEPDIR)/$(am__dirstamp)
libtest/libtest_libtest_la-runner.lo: libtest/$(am__dirstamp) \
@@ -2971,8 +3001,6 @@
libtest/$(DEPDIR)/$(am__dirstamp)
libtest/libtest_libtest_la-strerror.lo: libtest/$(am__dirstamp) \
libtest/$(DEPDIR)/$(am__dirstamp)
-libtest/libtest_libtest_la-test.lo: libtest/$(am__dirstamp) \
- libtest/$(DEPDIR)/$(am__dirstamp)
libtest/libtest_libtest_la-tmpfile.lo: libtest/$(am__dirstamp) \
libtest/$(DEPDIR)/$(am__dirstamp)
libtest/libtest_libtest_la-vchar.lo: libtest/$(am__dirstamp) \
@@ -3188,6 +3216,9 @@
tests/libmemcached-1.0/example_t_memcached_light-memcached_get.$(OBJEXT): \
tests/libmemcached-1.0/$(am__dirstamp) \
tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/example_t_memcached_light-print.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.$(OBJEXT): \
tests/libmemcached-1.0/$(am__dirstamp) \
tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
@@ -3272,9 +3303,18 @@
tests/libmemcached-1.0/atomsmasher.$(OBJEXT): \
tests/libmemcached-1.0/$(am__dirstamp) \
tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/callback_counter.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
tests/libmemcached-1.0/debug.$(OBJEXT): \
tests/libmemcached-1.0/$(am__dirstamp) \
tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/fetch_all_results.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/generate.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
tests/libmemcached-1.0/print.$(OBJEXT): \
tests/libmemcached-1.0/$(am__dirstamp) \
tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
@@ -3294,6 +3334,22 @@
$(AM_V_CXXLD)$(tests_cycle_LINK) $(tests_cycle_OBJECTS) $(tests_cycle_LDADD) $(LIBS)
tests/tests_failure-failure.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
+clients/tests_failure-execute.$(OBJEXT): clients/$(am__dirstamp) \
+ clients/$(DEPDIR)/$(am__dirstamp)
+clients/tests_failure-generator.$(OBJEXT): clients/$(am__dirstamp) \
+ clients/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/tests_failure-callback_counter.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/tests_failure-fetch_all_results.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/tests_failure-generate.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/tests_failure-print.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
tests/failure$(EXEEXT): $(tests_failure_OBJECTS) $(tests_failure_DEPENDENCIES) tests/$(am__dirstamp)
@rm -f tests/failure$(EXEEXT)
$(AM_V_CXXLD)$(tests_failure_LINK) $(tests_failure_OBJECTS) $(tests_failure_LDADD) $(LIBS)
@@ -3347,13 +3403,26 @@
tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-virtual_buckets.$(OBJEXT): \
tests/libmemcached-1.0/$(am__dirstamp) \
tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
-clients/tests_libmemcached_1_0_sasl-generator.$(OBJEXT): \
- clients/$(am__dirstamp) clients/$(DEPDIR)/$(am__dirstamp)
clients/tests_libmemcached_1_0_sasl-execute.$(OBJEXT): \
clients/$(am__dirstamp) clients/$(DEPDIR)/$(am__dirstamp)
+clients/tests_libmemcached_1_0_sasl-generator.$(OBJEXT): \
+ clients/$(am__dirstamp) clients/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
tests/libmemcached-1.0/sasl$(EXEEXT): $(tests_libmemcached_1_0_sasl_OBJECTS) $(tests_libmemcached_1_0_sasl_DEPENDENCIES) tests/libmemcached-1.0/$(am__dirstamp)
@rm -f tests/libmemcached-1.0/sasl$(EXEEXT)
$(AM_V_CXXLD)$(tests_libmemcached_1_0_sasl_LINK) $(tests_libmemcached_1_0_sasl_OBJECTS) $(tests_libmemcached_1_0_sasl_LDADD) $(LIBS)
+clients/tests_libmemcached_1_0_testapp-generator.$(OBJEXT): \
+ clients/$(am__dirstamp) clients/$(DEPDIR)/$(am__dirstamp)
+clients/tests_libmemcached_1_0_testapp-execute.$(OBJEXT): \
+ clients/$(am__dirstamp) clients/$(DEPDIR)/$(am__dirstamp)
tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-all_tests.$(OBJEXT): \
tests/libmemcached-1.0/$(am__dirstamp) \
tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
@@ -3432,13 +3501,13 @@
tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-virtual_buckets.$(OBJEXT): \
tests/libmemcached-1.0/$(am__dirstamp) \
tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
-clients/tests_libmemcached_1_0_testapp-generator.$(OBJEXT): \
- clients/$(am__dirstamp) clients/$(DEPDIR)/$(am__dirstamp)
-clients/tests_libmemcached_1_0_testapp-execute.$(OBJEXT): \
- clients/$(am__dirstamp) clients/$(DEPDIR)/$(am__dirstamp)
tests/libmemcached-1.0/testapp$(EXEEXT): $(tests_libmemcached_1_0_testapp_OBJECTS) $(tests_libmemcached_1_0_testapp_DEPENDENCIES) tests/libmemcached-1.0/$(am__dirstamp)
@rm -f tests/libmemcached-1.0/testapp$(EXEEXT)
$(AM_V_CXXLD)$(tests_libmemcached_1_0_testapp_LINK) $(tests_libmemcached_1_0_testapp_OBJECTS) $(tests_libmemcached_1_0_testapp_LDADD) $(LIBS)
+clients/tests_libmemcached_1_0_testsocket-execute.$(OBJEXT): \
+ clients/$(am__dirstamp) clients/$(DEPDIR)/$(am__dirstamp)
+clients/tests_libmemcached_1_0_testsocket-generator.$(OBJEXT): \
+ clients/$(am__dirstamp) clients/$(DEPDIR)/$(am__dirstamp)
tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-all_tests_socket.$(OBJEXT): \
tests/libmemcached-1.0/$(am__dirstamp) \
tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
@@ -3517,10 +3586,6 @@
tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-virtual_buckets.$(OBJEXT): \
tests/libmemcached-1.0/$(am__dirstamp) \
tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
-clients/tests_libmemcached_1_0_testsocket-generator.$(OBJEXT): \
- clients/$(am__dirstamp) clients/$(DEPDIR)/$(am__dirstamp)
-clients/tests_libmemcached_1_0_testsocket-execute.$(OBJEXT): \
- clients/$(am__dirstamp) clients/$(DEPDIR)/$(am__dirstamp)
tests/libmemcached-1.0/testsocket$(EXEEXT): $(tests_libmemcached_1_0_testsocket_OBJECTS) $(tests_libmemcached_1_0_testsocket_DEPENDENCIES) tests/libmemcached-1.0/$(am__dirstamp)
@rm -f tests/libmemcached-1.0/testsocket$(EXEEXT)
$(AM_V_CXXLD)$(tests_libmemcached_1_0_testsocket_LINK) $(tests_libmemcached_1_0_testsocket_OBJECTS) $(tests_libmemcached_1_0_testsocket_LDADD) $(LIBS)
@@ -3584,9 +3649,25 @@
tests/testhashkit$(EXEEXT): $(tests_testhashkit_OBJECTS) $(tests_testhashkit_DEPENDENCIES) tests/$(am__dirstamp)
@rm -f tests/testhashkit$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(tests_testhashkit_OBJECTS) $(tests_testhashkit_LDADD) $(LIBS)
+clients/tests_testplus-execute.$(OBJEXT): clients/$(am__dirstamp) \
+ clients/$(DEPDIR)/$(am__dirstamp)
+clients/tests_testplus-generator.$(OBJEXT): clients/$(am__dirstamp) \
+ clients/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/tests_testplus-callback_counter.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/tests_testplus-fetch_all_results.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/tests_testplus-generate.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
tests/libmemcached-1.0/tests_testplus-plus.$(OBJEXT): \
tests/libmemcached-1.0/$(am__dirstamp) \
tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
+tests/libmemcached-1.0/tests_testplus-print.$(OBJEXT): \
+ tests/libmemcached-1.0/$(am__dirstamp) \
+ tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
tests/testplus$(EXEEXT): $(tests_testplus_OBJECTS) $(tests_testplus_DEPENDENCIES) tests/$(am__dirstamp)
@rm -f tests/testplus$(EXEEXT)
$(AM_V_CXXLD)$(tests_testplus_LINK) $(tests_testplus_OBJECTS) $(tests_testplus_LDADD) $(LIBS)
@@ -3622,12 +3703,16 @@
-rm -f clients/ms_stats.$(OBJEXT)
-rm -f clients/ms_task.$(OBJEXT)
-rm -f clients/ms_thread.$(OBJEXT)
+ -rm -f clients/tests_failure-execute.$(OBJEXT)
+ -rm -f clients/tests_failure-generator.$(OBJEXT)
-rm -f clients/tests_libmemcached_1_0_sasl-execute.$(OBJEXT)
-rm -f clients/tests_libmemcached_1_0_sasl-generator.$(OBJEXT)
-rm -f clients/tests_libmemcached_1_0_testapp-execute.$(OBJEXT)
-rm -f clients/tests_libmemcached_1_0_testapp-generator.$(OBJEXT)
-rm -f clients/tests_libmemcached_1_0_testsocket-execute.$(OBJEXT)
-rm -f clients/tests_libmemcached_1_0_testsocket-generator.$(OBJEXT)
+ -rm -f clients/tests_testplus-execute.$(OBJEXT)
+ -rm -f clients/tests_testplus-generator.$(OBJEXT)
-rm -f clients/utilities.$(OBJEXT)
-rm -f clients/utilities.lo
-rm -f example/byteorder.$(OBJEXT)
@@ -4056,6 +4141,8 @@
-rm -f libtest/libtest_libtest_la-cpu.lo
-rm -f libtest/libtest_libtest_la-dream.$(OBJEXT)
-rm -f libtest/libtest_libtest_la-dream.lo
+ -rm -f libtest/libtest_libtest_la-drizzled.$(OBJEXT)
+ -rm -f libtest/libtest_libtest_la-drizzled.lo
-rm -f libtest/libtest_libtest_la-fatal.$(OBJEXT)
-rm -f libtest/libtest_libtest_la-fatal.lo
-rm -f libtest/libtest_libtest_la-framework.$(OBJEXT)
@@ -4072,6 +4159,8 @@
-rm -f libtest/libtest_libtest_la-killpid.lo
-rm -f libtest/libtest_libtest_la-libtool.$(OBJEXT)
-rm -f libtest/libtest_libtest_la-libtool.lo
+ -rm -f libtest/libtest_libtest_la-main.$(OBJEXT)
+ -rm -f libtest/libtest_libtest_la-main.lo
-rm -f libtest/libtest_libtest_la-memcached.$(OBJEXT)
-rm -f libtest/libtest_libtest_la-memcached.lo
-rm -f libtest/libtest_libtest_la-port.$(OBJEXT)
@@ -4088,8 +4177,6 @@
-rm -f libtest/libtest_libtest_la-socket.lo
-rm -f libtest/libtest_libtest_la-strerror.$(OBJEXT)
-rm -f libtest/libtest_libtest_la-strerror.lo
- -rm -f libtest/libtest_libtest_la-test.$(OBJEXT)
- -rm -f libtest/libtest_libtest_la-test.lo
-rm -f libtest/libtest_libtest_la-tmpfile.$(OBJEXT)
-rm -f libtest/libtest_libtest_la-tmpfile.lo
-rm -f libtest/libtest_libtest_la-vchar.$(OBJEXT)
@@ -4113,16 +4200,27 @@
-rm -f poll/libmemcachedinternal_libmemcachedinternal_la-poll.lo
-rm -f tests/hashkit_functions.$(OBJEXT)
-rm -f tests/libmemcached-1.0/atomsmasher.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/callback_counter.$(OBJEXT)
-rm -f tests/libmemcached-1.0/debug.$(OBJEXT)
-rm -f tests/libmemcached-1.0/example_t_memcached_light-memcached_get.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/example_t_memcached_light-print.$(OBJEXT)
-rm -f tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/fetch_all_results.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/generate.$(OBJEXT)
-rm -f tests/libmemcached-1.0/print.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/tests_failure-callback_counter.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/tests_failure-fetch_all_results.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/tests_failure-generate.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/tests_failure-print.$(OBJEXT)
-rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_internals-internals.$(OBJEXT)
-rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_internals-string.$(OBJEXT)
-rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-basic.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.$(OBJEXT)
-rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-debug.$(OBJEXT)
-rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-deprecated.$(OBJEXT)
-rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-error_conditions.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.$(OBJEXT)
-rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-ketama.$(OBJEXT)
-rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-namespace.$(OBJEXT)
-rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-parser.$(OBJEXT)
@@ -4183,7 +4281,11 @@
-rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-stat.$(OBJEXT)
-rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-touch.$(OBJEXT)
-rm -f tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-virtual_buckets.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/tests_testplus-callback_counter.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/tests_testplus-fetch_all_results.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/tests_testplus-generate.$(OBJEXT)
-rm -f tests/libmemcached-1.0/tests_testplus-plus.$(OBJEXT)
+ -rm -f tests/libmemcached-1.0/tests_testplus-print.$(OBJEXT)
-rm -f tests/mem_udp.$(OBJEXT)
-rm -f tests/tests_cycle-cycle.$(OBJEXT)
-rm -f tests/tests_failure-failure.$(OBJEXT)
@@ -4233,12 +4335,16 @@
@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/ms_stats.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/ms_task.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/ms_thread.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/tests_failure-execute.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/tests_failure-generator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-generator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/tests_testplus-execute.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/tests_testplus-generator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@clients/$(DEPDIR)/utilities.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@example/$(DEPDIR)/byteorder.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@example/$(DEPDIR)/interface_v0.Po@am__quote@
@@ -4459,6 +4565,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-core.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-cpu.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-dream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-drizzled.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-fatal.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-framework.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-gearmand.Plo@am__quote@
@@ -4467,6 +4574,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-is_local.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-killpid.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-libtool.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-main.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-memcached.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-port.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-runner.Plo@am__quote@
@@ -4475,7 +4583,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-signal.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-socket.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-strerror.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-test.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-tmpfile.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-vchar.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_unittest-unittest.Po@am__quote@
@@ -4510,16 +4617,27 @@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/tests_memstat-memstat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/tests_memtouch-memtouch.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/atomsmasher.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/callback_counter.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/debug.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-memcached_get.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-setup_and_teardowns.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/fetch_all_results.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/generate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/print.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_failure-callback_counter.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_failure-fetch_all_results.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_failure-generate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_failure-print.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_internals-internals.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_internals-string.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-basic.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-callback_counter.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-debug.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-deprecated.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-error_conditions.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-fetch_all_results.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-generate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-ketama.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-namespace.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-parser.Po@am__quote@
@@ -4580,7 +4698,11 @@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_testsocket-stat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_testsocket-touch.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_testsocket-virtual_buckets.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-callback_counter.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-fetch_all_results.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-generate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-plus.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-print.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/daemon.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libtest_libtest_la-instance.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libtest_libtest_la-operation.Plo@am__quote@
@@ -6312,6 +6434,14 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -c -o libtest/libtest_libtest_la-has.lo `test -f 'libtest/has.cc' || echo '$(srcdir)/'`libtest/has.cc
+libtest/libtest_libtest_la-drizzled.lo: libtest/drizzled.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -MT libtest/libtest_libtest_la-drizzled.lo -MD -MP -MF libtest/$(DEPDIR)/libtest_libtest_la-drizzled.Tpo -c -o libtest/libtest_libtest_la-drizzled.lo `test -f 'libtest/drizzled.cc' || echo '$(srcdir)/'`libtest/drizzled.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libtest/$(DEPDIR)/libtest_libtest_la-drizzled.Tpo libtest/$(DEPDIR)/libtest_libtest_la-drizzled.Plo
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='libtest/drizzled.cc' object='libtest/libtest_libtest_la-drizzled.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -c -o libtest/libtest_libtest_la-drizzled.lo `test -f 'libtest/drizzled.cc' || echo '$(srcdir)/'`libtest/drizzled.cc
+
libtest/libtest_libtest_la-http.lo: libtest/http.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -MT libtest/libtest_libtest_la-http.lo -MD -MP -MF libtest/$(DEPDIR)/libtest_libtest_la-http.Tpo -c -o libtest/libtest_libtest_la-http.lo `test -f 'libtest/http.cc' || echo '$(srcdir)/'`libtest/http.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libtest/$(DEPDIR)/libtest_libtest_la-http.Tpo libtest/$(DEPDIR)/libtest_libtest_la-http.Plo
@@ -6344,6 +6474,14 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -c -o libtest/libtest_libtest_la-libtool.lo `test -f 'libtest/libtool.cc' || echo '$(srcdir)/'`libtest/libtool.cc
+libtest/libtest_libtest_la-main.lo: libtest/main.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -MT libtest/libtest_libtest_la-main.lo -MD -MP -MF libtest/$(DEPDIR)/libtest_libtest_la-main.Tpo -c -o libtest/libtest_libtest_la-main.lo `test -f 'libtest/main.cc' || echo '$(srcdir)/'`libtest/main.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libtest/$(DEPDIR)/libtest_libtest_la-main.Tpo libtest/$(DEPDIR)/libtest_libtest_la-main.Plo
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='libtest/main.cc' object='libtest/libtest_libtest_la-main.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -c -o libtest/libtest_libtest_la-main.lo `test -f 'libtest/main.cc' || echo '$(srcdir)/'`libtest/main.cc
+
libtest/libtest_libtest_la-port.lo: libtest/port.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -MT libtest/libtest_libtest_la-port.lo -MD -MP -MF libtest/$(DEPDIR)/libtest_libtest_la-port.Tpo -c -o libtest/libtest_libtest_la-port.lo `test -f 'libtest/port.cc' || echo '$(srcdir)/'`libtest/port.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libtest/$(DEPDIR)/libtest_libtest_la-port.Tpo libtest/$(DEPDIR)/libtest_libtest_la-port.Plo
@@ -6400,14 +6538,6 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -c -o libtest/libtest_libtest_la-strerror.lo `test -f 'libtest/strerror.cc' || echo '$(srcdir)/'`libtest/strerror.cc
-libtest/libtest_libtest_la-test.lo: libtest/test.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -MT libtest/libtest_libtest_la-test.lo -MD -MP -MF libtest/$(DEPDIR)/libtest_libtest_la-test.Tpo -c -o libtest/libtest_libtest_la-test.lo `test -f 'libtest/test.cc' || echo '$(srcdir)/'`libtest/test.cc
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libtest/$(DEPDIR)/libtest_libtest_la-test.Tpo libtest/$(DEPDIR)/libtest_libtest_la-test.Plo
-@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='libtest/test.cc' object='libtest/libtest_libtest_la-test.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -c -o libtest/libtest_libtest_la-test.lo `test -f 'libtest/test.cc' || echo '$(srcdir)/'`libtest/test.cc
-
libtest/libtest_libtest_la-tmpfile.lo: libtest/tmpfile.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -MT libtest/libtest_libtest_la-tmpfile.lo -MD -MP -MF libtest/$(DEPDIR)/libtest_libtest_la-tmpfile.Tpo -c -o libtest/libtest_libtest_la-tmpfile.lo `test -f 'libtest/tmpfile.cc' || echo '$(srcdir)/'`libtest/tmpfile.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libtest/$(DEPDIR)/libtest_libtest_la-tmpfile.Tpo libtest/$(DEPDIR)/libtest_libtest_la-tmpfile.Plo
@@ -6544,6 +6674,22 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/example_t_memcached_light-memcached_get.obj `if test -f 'tests/libmemcached-1.0/memcached_get.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/memcached_get.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/memcached_get.cc'; fi`
+tests/libmemcached-1.0/example_t_memcached_light-print.o: tests/libmemcached-1.0/print.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/example_t_memcached_light-print.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Tpo -c -o tests/libmemcached-1.0/example_t_memcached_light-print.o `test -f 'tests/libmemcached-1.0/print.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/print.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Tpo tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/print.cc' object='tests/libmemcached-1.0/example_t_memcached_light-print.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/example_t_memcached_light-print.o `test -f 'tests/libmemcached-1.0/print.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/print.cc
+
+tests/libmemcached-1.0/example_t_memcached_light-print.obj: tests/libmemcached-1.0/print.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/example_t_memcached_light-print.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Tpo -c -o tests/libmemcached-1.0/example_t_memcached_light-print.obj `if test -f 'tests/libmemcached-1.0/print.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/print.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/print.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Tpo tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/print.cc' object='tests/libmemcached-1.0/example_t_memcached_light-print.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/example_t_memcached_light-print.obj `if test -f 'tests/libmemcached-1.0/print.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/print.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/print.cc'; fi`
+
tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.o: tests/libmemcached-1.0/setup_and_teardowns.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-setup_and_teardowns.Tpo -c -o tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.o `test -f 'tests/libmemcached-1.0/setup_and_teardowns.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/setup_and_teardowns.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-setup_and_teardowns.Tpo tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-setup_and_teardowns.Po
@@ -6608,6 +6754,102 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o tests/tests_failure-failure.obj `if test -f 'tests/failure.cc'; then $(CYGPATH_W) 'tests/failure.cc'; else $(CYGPATH_W) '$(srcdir)/tests/failure.cc'; fi`
+clients/tests_failure-execute.o: clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_failure-execute.o -MD -MP -MF clients/$(DEPDIR)/tests_failure-execute.Tpo -c -o clients/tests_failure-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_failure-execute.Tpo clients/$(DEPDIR)/tests_failure-execute.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_failure-execute.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_failure-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
+
+clients/tests_failure-execute.obj: clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_failure-execute.obj -MD -MP -MF clients/$(DEPDIR)/tests_failure-execute.Tpo -c -o clients/tests_failure-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_failure-execute.Tpo clients/$(DEPDIR)/tests_failure-execute.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_failure-execute.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_failure-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
+
+clients/tests_failure-generator.o: clients/generator.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_failure-generator.o -MD -MP -MF clients/$(DEPDIR)/tests_failure-generator.Tpo -c -o clients/tests_failure-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_failure-generator.Tpo clients/$(DEPDIR)/tests_failure-generator.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/generator.cc' object='clients/tests_failure-generator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_failure-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
+
+clients/tests_failure-generator.obj: clients/generator.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_failure-generator.obj -MD -MP -MF clients/$(DEPDIR)/tests_failure-generator.Tpo -c -o clients/tests_failure-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_failure-generator.Tpo clients/$(DEPDIR)/tests_failure-generator.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/generator.cc' object='clients/tests_failure-generator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_failure-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
+
+tests/libmemcached-1.0/tests_failure-callback_counter.o: tests/libmemcached-1.0/callback_counter.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_failure-callback_counter.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_failure-callback_counter.Tpo -c -o tests/libmemcached-1.0/tests_failure-callback_counter.o `test -f 'tests/libmemcached-1.0/callback_counter.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/callback_counter.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_failure-callback_counter.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_failure-callback_counter.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/callback_counter.cc' object='tests/libmemcached-1.0/tests_failure-callback_counter.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_failure-callback_counter.o `test -f 'tests/libmemcached-1.0/callback_counter.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/callback_counter.cc
+
+tests/libmemcached-1.0/tests_failure-callback_counter.obj: tests/libmemcached-1.0/callback_counter.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_failure-callback_counter.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_failure-callback_counter.Tpo -c -o tests/libmemcached-1.0/tests_failure-callback_counter.obj `if test -f 'tests/libmemcached-1.0/callback_counter.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/callback_counter.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/callback_counter.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_failure-callback_counter.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_failure-callback_counter.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/callback_counter.cc' object='tests/libmemcached-1.0/tests_failure-callback_counter.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_failure-callback_counter.obj `if test -f 'tests/libmemcached-1.0/callback_counter.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/callback_counter.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/callback_counter.cc'; fi`
+
+tests/libmemcached-1.0/tests_failure-fetch_all_results.o: tests/libmemcached-1.0/fetch_all_results.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_failure-fetch_all_results.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_failure-fetch_all_results.Tpo -c -o tests/libmemcached-1.0/tests_failure-fetch_all_results.o `test -f 'tests/libmemcached-1.0/fetch_all_results.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/fetch_all_results.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_failure-fetch_all_results.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_failure-fetch_all_results.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/fetch_all_results.cc' object='tests/libmemcached-1.0/tests_failure-fetch_all_results.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_failure-fetch_all_results.o `test -f 'tests/libmemcached-1.0/fetch_all_results.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/fetch_all_results.cc
+
+tests/libmemcached-1.0/tests_failure-fetch_all_results.obj: tests/libmemcached-1.0/fetch_all_results.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_failure-fetch_all_results.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_failure-fetch_all_results.Tpo -c -o tests/libmemcached-1.0/tests_failure-fetch_all_results.obj `if test -f 'tests/libmemcached-1.0/fetch_all_results.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/fetch_all_results.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/fetch_all_results.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_failure-fetch_all_results.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_failure-fetch_all_results.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/fetch_all_results.cc' object='tests/libmemcached-1.0/tests_failure-fetch_all_results.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_failure-fetch_all_results.obj `if test -f 'tests/libmemcached-1.0/fetch_all_results.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/fetch_all_results.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/fetch_all_results.cc'; fi`
+
+tests/libmemcached-1.0/tests_failure-generate.o: tests/libmemcached-1.0/generate.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_failure-generate.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_failure-generate.Tpo -c -o tests/libmemcached-1.0/tests_failure-generate.o `test -f 'tests/libmemcached-1.0/generate.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/generate.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_failure-generate.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_failure-generate.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/generate.cc' object='tests/libmemcached-1.0/tests_failure-generate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_failure-generate.o `test -f 'tests/libmemcached-1.0/generate.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/generate.cc
+
+tests/libmemcached-1.0/tests_failure-generate.obj: tests/libmemcached-1.0/generate.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_failure-generate.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_failure-generate.Tpo -c -o tests/libmemcached-1.0/tests_failure-generate.obj `if test -f 'tests/libmemcached-1.0/generate.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/generate.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/generate.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_failure-generate.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_failure-generate.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/generate.cc' object='tests/libmemcached-1.0/tests_failure-generate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_failure-generate.obj `if test -f 'tests/libmemcached-1.0/generate.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/generate.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/generate.cc'; fi`
+
+tests/libmemcached-1.0/tests_failure-print.o: tests/libmemcached-1.0/print.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_failure-print.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_failure-print.Tpo -c -o tests/libmemcached-1.0/tests_failure-print.o `test -f 'tests/libmemcached-1.0/print.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/print.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_failure-print.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_failure-print.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/print.cc' object='tests/libmemcached-1.0/tests_failure-print.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_failure-print.o `test -f 'tests/libmemcached-1.0/print.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/print.cc
+
+tests/libmemcached-1.0/tests_failure-print.obj: tests/libmemcached-1.0/print.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_failure-print.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_failure-print.Tpo -c -o tests/libmemcached-1.0/tests_failure-print.obj `if test -f 'tests/libmemcached-1.0/print.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/print.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/print.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_failure-print.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_failure-print.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/print.cc' object='tests/libmemcached-1.0/tests_failure-print.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_failure_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_failure-print.obj `if test -f 'tests/libmemcached-1.0/print.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/print.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/print.cc'; fi`
+
tests/tests_hash_plus-hash_plus.o: tests/hash_plus.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_hash_plus_CXXFLAGS) $(CXXFLAGS) -MT tests/tests_hash_plus-hash_plus.o -MD -MP -MF tests/$(DEPDIR)/tests_hash_plus-hash_plus.Tpo -c -o tests/tests_hash_plus-hash_plus.o `test -f 'tests/hash_plus.cc' || echo '$(srcdir)/'`tests/hash_plus.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_hash_plus-hash_plus.Tpo tests/$(DEPDIR)/tests_hash_plus-hash_plus.Po
@@ -6848,6 +7090,22 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-virtual_buckets.obj `if test -f 'tests/libmemcached-1.0/virtual_buckets.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/virtual_buckets.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/virtual_buckets.cc'; fi`
+clients/tests_libmemcached_1_0_sasl-execute.o: clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_sasl-execute.o -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Tpo -c -o clients/tests_libmemcached_1_0_sasl-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_libmemcached_1_0_sasl-execute.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_sasl-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
+
+clients/tests_libmemcached_1_0_sasl-execute.obj: clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_sasl-execute.obj -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Tpo -c -o clients/tests_libmemcached_1_0_sasl-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_libmemcached_1_0_sasl-execute.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_sasl-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
+
clients/tests_libmemcached_1_0_sasl-generator.o: clients/generator.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_sasl-generator.o -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-generator.Tpo -c -o clients/tests_libmemcached_1_0_sasl-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-generator.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-generator.Po
@@ -6864,21 +7122,85 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_sasl-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
-clients/tests_libmemcached_1_0_sasl-execute.o: clients/execute.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_sasl-execute.o -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Tpo -c -o clients/tests_libmemcached_1_0_sasl-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Po
+tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.o: tests/libmemcached-1.0/callback_counter.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-callback_counter.Tpo -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.o `test -f 'tests/libmemcached-1.0/callback_counter.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/callback_counter.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-callback_counter.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-callback_counter.Po
@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_libmemcached_1_0_sasl-execute.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/callback_counter.cc' object='tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_sasl-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.o `test -f 'tests/libmemcached-1.0/callback_counter.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/callback_counter.cc
-clients/tests_libmemcached_1_0_sasl-execute.obj: clients/execute.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_sasl-execute.obj -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Tpo -c -o clients/tests_libmemcached_1_0_sasl-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_sasl-execute.Po
+tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.obj: tests/libmemcached-1.0/callback_counter.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-callback_counter.Tpo -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.obj `if test -f 'tests/libmemcached-1.0/callback_counter.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/callback_counter.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/callback_counter.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-callback_counter.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-callback_counter.Po
@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_libmemcached_1_0_sasl-execute.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/callback_counter.cc' object='tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_sasl-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-callback_counter.obj `if test -f 'tests/libmemcached-1.0/callback_counter.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/callback_counter.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/callback_counter.cc'; fi`
+
+tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.o: tests/libmemcached-1.0/fetch_all_results.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-fetch_all_results.Tpo -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.o `test -f 'tests/libmemcached-1.0/fetch_all_results.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/fetch_all_results.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-fetch_all_results.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-fetch_all_results.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/fetch_all_results.cc' object='tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.o `test -f 'tests/libmemcached-1.0/fetch_all_results.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/fetch_all_results.cc
+
+tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.obj: tests/libmemcached-1.0/fetch_all_results.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-fetch_all_results.Tpo -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.obj `if test -f 'tests/libmemcached-1.0/fetch_all_results.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/fetch_all_results.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/fetch_all_results.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-fetch_all_results.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-fetch_all_results.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/fetch_all_results.cc' object='tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-fetch_all_results.obj `if test -f 'tests/libmemcached-1.0/fetch_all_results.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/fetch_all_results.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/fetch_all_results.cc'; fi`
+
+tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.o: tests/libmemcached-1.0/generate.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-generate.Tpo -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.o `test -f 'tests/libmemcached-1.0/generate.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/generate.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-generate.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-generate.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/generate.cc' object='tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.o `test -f 'tests/libmemcached-1.0/generate.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/generate.cc
+
+tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.obj: tests/libmemcached-1.0/generate.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-generate.Tpo -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.obj `if test -f 'tests/libmemcached-1.0/generate.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/generate.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/generate.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-generate.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_sasl-generate.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/generate.cc' object='tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.obj `if test -f 'tests/libmemcached-1.0/generate.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/generate.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/generate.cc'; fi`
+
+clients/tests_libmemcached_1_0_testapp-generator.o: clients/generator.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testapp-generator.o -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Tpo -c -o clients/tests_libmemcached_1_0_testapp-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/generator.cc' object='clients/tests_libmemcached_1_0_testapp-generator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testapp-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
+
+clients/tests_libmemcached_1_0_testapp-generator.obj: clients/generator.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testapp-generator.obj -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Tpo -c -o clients/tests_libmemcached_1_0_testapp-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/generator.cc' object='clients/tests_libmemcached_1_0_testapp-generator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testapp-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
+
+clients/tests_libmemcached_1_0_testapp-execute.o: clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testapp-execute.o -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Tpo -c -o clients/tests_libmemcached_1_0_testapp-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_libmemcached_1_0_testapp-execute.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testapp-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
+
+clients/tests_libmemcached_1_0_testapp-execute.obj: clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testapp-execute.obj -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Tpo -c -o clients/tests_libmemcached_1_0_testapp-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_libmemcached_1_0_testapp-execute.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testapp-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-all_tests.o: tests/libmemcached-1.0/all_tests.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-all_tests.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_testapp-all_tests.Tpo -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-all_tests.o `test -f 'tests/libmemcached-1.0/all_tests.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/all_tests.cc
@@ -7296,37 +7618,37 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-virtual_buckets.obj `if test -f 'tests/libmemcached-1.0/virtual_buckets.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/virtual_buckets.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/virtual_buckets.cc'; fi`
-clients/tests_libmemcached_1_0_testapp-generator.o: clients/generator.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testapp-generator.o -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Tpo -c -o clients/tests_libmemcached_1_0_testapp-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Po
+clients/tests_libmemcached_1_0_testsocket-execute.o: clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testsocket-execute.o -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Tpo -c -o clients/tests_libmemcached_1_0_testsocket-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Po
@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/generator.cc' object='clients/tests_libmemcached_1_0_testapp-generator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_libmemcached_1_0_testsocket-execute.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testapp-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testsocket-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
-clients/tests_libmemcached_1_0_testapp-generator.obj: clients/generator.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testapp-generator.obj -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Tpo -c -o clients/tests_libmemcached_1_0_testapp-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-generator.Po
+clients/tests_libmemcached_1_0_testsocket-execute.obj: clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testsocket-execute.obj -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Tpo -c -o clients/tests_libmemcached_1_0_testsocket-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Po
@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/generator.cc' object='clients/tests_libmemcached_1_0_testapp-generator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_libmemcached_1_0_testsocket-execute.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testapp-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testsocket-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
-clients/tests_libmemcached_1_0_testapp-execute.o: clients/execute.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testapp-execute.o -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Tpo -c -o clients/tests_libmemcached_1_0_testapp-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Po
+clients/tests_libmemcached_1_0_testsocket-generator.o: clients/generator.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testsocket-generator.o -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Tpo -c -o clients/tests_libmemcached_1_0_testsocket-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Po
@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_libmemcached_1_0_testapp-execute.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/generator.cc' object='clients/tests_libmemcached_1_0_testsocket-generator.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testapp-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testsocket-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
-clients/tests_libmemcached_1_0_testapp-execute.obj: clients/execute.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testapp-execute.obj -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Tpo -c -o clients/tests_libmemcached_1_0_testapp-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testapp-execute.Po
+clients/tests_libmemcached_1_0_testsocket-generator.obj: clients/generator.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testsocket-generator.obj -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Tpo -c -o clients/tests_libmemcached_1_0_testsocket-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Po
@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_libmemcached_1_0_testapp-execute.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/generator.cc' object='clients/tests_libmemcached_1_0_testsocket-generator.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testapp-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testsocket-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-all_tests_socket.o: tests/libmemcached-1.0/all_tests_socket.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-all_tests_socket.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_libmemcached_1_0_testsocket-all_tests_socket.Tpo -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-all_tests_socket.o `test -f 'tests/libmemcached-1.0/all_tests_socket.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/all_tests_socket.cc
@@ -7744,38 +8066,6 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-virtual_buckets.obj `if test -f 'tests/libmemcached-1.0/virtual_buckets.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/virtual_buckets.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/virtual_buckets.cc'; fi`
-clients/tests_libmemcached_1_0_testsocket-generator.o: clients/generator.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testsocket-generator.o -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Tpo -c -o clients/tests_libmemcached_1_0_testsocket-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Po
-@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/generator.cc' object='clients/tests_libmemcached_1_0_testsocket-generator.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testsocket-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
-
-clients/tests_libmemcached_1_0_testsocket-generator.obj: clients/generator.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testsocket-generator.obj -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Tpo -c -o clients/tests_libmemcached_1_0_testsocket-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-generator.Po
-@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/generator.cc' object='clients/tests_libmemcached_1_0_testsocket-generator.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testsocket-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
-
-clients/tests_libmemcached_1_0_testsocket-execute.o: clients/execute.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testsocket-execute.o -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Tpo -c -o clients/tests_libmemcached_1_0_testsocket-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Po
-@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_libmemcached_1_0_testsocket-execute.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testsocket-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
-
-clients/tests_libmemcached_1_0_testsocket-execute.obj: clients/execute.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_libmemcached_1_0_testsocket-execute.obj -MD -MP -MF clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Tpo -c -o clients/tests_libmemcached_1_0_testsocket-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Tpo clients/$(DEPDIR)/tests_libmemcached_1_0_testsocket-execute.Po
-@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_libmemcached_1_0_testsocket-execute.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_libmemcached_1_0_testsocket-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
-
tests/tests_memcapable-memcapable.o: tests/memcapable.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_memcapable_CXXFLAGS) $(CXXFLAGS) -MT tests/tests_memcapable-memcapable.o -MD -MP -MF tests/$(DEPDIR)/tests_memcapable-memcapable.Tpo -c -o tests/tests_memcapable-memcapable.o `test -f 'tests/memcapable.cc' || echo '$(srcdir)/'`tests/memcapable.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_memcapable-memcapable.Tpo tests/$(DEPDIR)/tests_memcapable-memcapable.Po
@@ -7952,6 +8242,86 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_memtouch_CXXFLAGS) $(CXXFLAGS) -c -o tests/tests_memtouch-memtouch.obj `if test -f 'tests/memtouch.cc'; then $(CYGPATH_W) 'tests/memtouch.cc'; else $(CYGPATH_W) '$(srcdir)/tests/memtouch.cc'; fi`
+clients/tests_testplus-execute.o: clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_testplus-execute.o -MD -MP -MF clients/$(DEPDIR)/tests_testplus-execute.Tpo -c -o clients/tests_testplus-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_testplus-execute.Tpo clients/$(DEPDIR)/tests_testplus-execute.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_testplus-execute.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_testplus-execute.o `test -f 'clients/execute.cc' || echo '$(srcdir)/'`clients/execute.cc
+
+clients/tests_testplus-execute.obj: clients/execute.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_testplus-execute.obj -MD -MP -MF clients/$(DEPDIR)/tests_testplus-execute.Tpo -c -o clients/tests_testplus-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_testplus-execute.Tpo clients/$(DEPDIR)/tests_testplus-execute.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/execute.cc' object='clients/tests_testplus-execute.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_testplus-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
+
+clients/tests_testplus-generator.o: clients/generator.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_testplus-generator.o -MD -MP -MF clients/$(DEPDIR)/tests_testplus-generator.Tpo -c -o clients/tests_testplus-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_testplus-generator.Tpo clients/$(DEPDIR)/tests_testplus-generator.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/generator.cc' object='clients/tests_testplus-generator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_testplus-generator.o `test -f 'clients/generator.cc' || echo '$(srcdir)/'`clients/generator.cc
+
+clients/tests_testplus-generator.obj: clients/generator.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT clients/tests_testplus-generator.obj -MD -MP -MF clients/$(DEPDIR)/tests_testplus-generator.Tpo -c -o clients/tests_testplus-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) clients/$(DEPDIR)/tests_testplus-generator.Tpo clients/$(DEPDIR)/tests_testplus-generator.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='clients/generator.cc' object='clients/tests_testplus-generator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o clients/tests_testplus-generator.obj `if test -f 'clients/generator.cc'; then $(CYGPATH_W) 'clients/generator.cc'; else $(CYGPATH_W) '$(srcdir)/clients/generator.cc'; fi`
+
+tests/libmemcached-1.0/tests_testplus-callback_counter.o: tests/libmemcached-1.0/callback_counter.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_testplus-callback_counter.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-callback_counter.Tpo -c -o tests/libmemcached-1.0/tests_testplus-callback_counter.o `test -f 'tests/libmemcached-1.0/callback_counter.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/callback_counter.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-callback_counter.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-callback_counter.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/callback_counter.cc' object='tests/libmemcached-1.0/tests_testplus-callback_counter.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_testplus-callback_counter.o `test -f 'tests/libmemcached-1.0/callback_counter.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/callback_counter.cc
+
+tests/libmemcached-1.0/tests_testplus-callback_counter.obj: tests/libmemcached-1.0/callback_counter.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_testplus-callback_counter.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-callback_counter.Tpo -c -o tests/libmemcached-1.0/tests_testplus-callback_counter.obj `if test -f 'tests/libmemcached-1.0/callback_counter.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/callback_counter.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/callback_counter.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-callback_counter.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-callback_counter.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/callback_counter.cc' object='tests/libmemcached-1.0/tests_testplus-callback_counter.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_testplus-callback_counter.obj `if test -f 'tests/libmemcached-1.0/callback_counter.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/callback_counter.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/callback_counter.cc'; fi`
+
+tests/libmemcached-1.0/tests_testplus-fetch_all_results.o: tests/libmemcached-1.0/fetch_all_results.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_testplus-fetch_all_results.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-fetch_all_results.Tpo -c -o tests/libmemcached-1.0/tests_testplus-fetch_all_results.o `test -f 'tests/libmemcached-1.0/fetch_all_results.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/fetch_all_results.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-fetch_all_results.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-fetch_all_results.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/fetch_all_results.cc' object='tests/libmemcached-1.0/tests_testplus-fetch_all_results.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_testplus-fetch_all_results.o `test -f 'tests/libmemcached-1.0/fetch_all_results.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/fetch_all_results.cc
+
+tests/libmemcached-1.0/tests_testplus-fetch_all_results.obj: tests/libmemcached-1.0/fetch_all_results.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_testplus-fetch_all_results.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-fetch_all_results.Tpo -c -o tests/libmemcached-1.0/tests_testplus-fetch_all_results.obj `if test -f 'tests/libmemcached-1.0/fetch_all_results.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/fetch_all_results.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/fetch_all_results.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-fetch_all_results.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-fetch_all_results.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/fetch_all_results.cc' object='tests/libmemcached-1.0/tests_testplus-fetch_all_results.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_testplus-fetch_all_results.obj `if test -f 'tests/libmemcached-1.0/fetch_all_results.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/fetch_all_results.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/fetch_all_results.cc'; fi`
+
+tests/libmemcached-1.0/tests_testplus-generate.o: tests/libmemcached-1.0/generate.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_testplus-generate.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-generate.Tpo -c -o tests/libmemcached-1.0/tests_testplus-generate.o `test -f 'tests/libmemcached-1.0/generate.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/generate.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-generate.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-generate.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/generate.cc' object='tests/libmemcached-1.0/tests_testplus-generate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_testplus-generate.o `test -f 'tests/libmemcached-1.0/generate.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/generate.cc
+
+tests/libmemcached-1.0/tests_testplus-generate.obj: tests/libmemcached-1.0/generate.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_testplus-generate.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-generate.Tpo -c -o tests/libmemcached-1.0/tests_testplus-generate.obj `if test -f 'tests/libmemcached-1.0/generate.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/generate.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/generate.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-generate.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-generate.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/generate.cc' object='tests/libmemcached-1.0/tests_testplus-generate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_testplus-generate.obj `if test -f 'tests/libmemcached-1.0/generate.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/generate.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/generate.cc'; fi`
+
tests/libmemcached-1.0/tests_testplus-plus.o: tests/libmemcached-1.0/plus.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_testplus-plus.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-plus.Tpo -c -o tests/libmemcached-1.0/tests_testplus-plus.o `test -f 'tests/libmemcached-1.0/plus.cpp' || echo '$(srcdir)/'`tests/libmemcached-1.0/plus.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-plus.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-plus.Po
@@ -7968,6 +8338,22 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_testplus-plus.obj `if test -f 'tests/libmemcached-1.0/plus.cpp'; then $(CYGPATH_W) 'tests/libmemcached-1.0/plus.cpp'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/plus.cpp'; fi`
+tests/libmemcached-1.0/tests_testplus-print.o: tests/libmemcached-1.0/print.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_testplus-print.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-print.Tpo -c -o tests/libmemcached-1.0/tests_testplus-print.o `test -f 'tests/libmemcached-1.0/print.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/print.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-print.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-print.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/print.cc' object='tests/libmemcached-1.0/tests_testplus-print.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_testplus-print.o `test -f 'tests/libmemcached-1.0/print.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/print.cc
+
+tests/libmemcached-1.0/tests_testplus-print.obj: tests/libmemcached-1.0/print.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/tests_testplus-print.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-print.Tpo -c -o tests/libmemcached-1.0/tests_testplus-print.obj `if test -f 'tests/libmemcached-1.0/print.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/print.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/print.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-print.Tpo tests/libmemcached-1.0/$(DEPDIR)/tests_testplus-print.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/libmemcached-1.0/print.cc' object='tests/libmemcached-1.0/tests_testplus-print.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tests_testplus_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/tests_testplus-print.obj `if test -f 'tests/libmemcached-1.0/print.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/print.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/print.cc'; fi`
+
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -8666,7 +9052,7 @@
distclean-libtest-check:
-rm -rf tmp_chroot
-libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run
+libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
tmp_chroot:
@$(mkdir_p) tmp_chroot
@@ -8680,6 +9066,9 @@
tmp_chroot/var/tmp: tmp_chroot/var
@$(mkdir_p) tmp_chroot/var/tmp
+tmp_chroot/var/drizzle: tmp_chroot/var
+ @$(mkdir_p) tmp_chroot/var/drizzle
+
tmp_chroot/var/run: tmp_chroot/var
@$(mkdir_p) tmp_chroot/var/run
test-unittest: libtest/unittest
@@ -8843,6 +9232,16 @@
valgrind-memcached_light: example/t/memcached_light example/memcached_light
$(VALGRIND_COMMAND) example/t/memcached_light
+libmemcached/csl/parser.h: libmemcached/csl/parser.cc
+
+libmemcached/csl/parser.cc: libmemcached/csl/parser.yy libmemcached/csl/scanner.l libmemcached/csl/scanner.h
+ $(AM_V_YACC)$(am__skipyacc) $(YACC) $(YLFLAGS) $(AM_YFLAGS) -o $@ $<
+
+libmemcached/csl/scanner.h: libmemcached/csl/scanner.cc
+
+libmemcached/csl/scanner.cc: libmemcached/csl/scanner.l libmemcached/csl/parser.yy
+ $(AM_V_GEN)$(LEX) $<
+
libmemcached/options.cc: libmemcached/csl/parser.h
libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/clients/generator.cc
^
|
| @@ -44,14 +44,18 @@
void pairs_free(pairs_st *pairs)
{
if (pairs == NULL)
+ {
return;
+ }
/* We free until we hit the null pair we stores during creation */
for (uint32_t x= 0; pairs[x].key; x++)
{
free(pairs[x].key);
if (pairs[x].value)
+ {
free(pairs[x].value);
+ }
}
free(pairs);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/config.in
^
|
| @@ -30,6 +30,9 @@
/* Define to 1 to enable debugging code. */
#undef DEBUG
+/* Support for DrizzleD */
+#undef DRIZZLED_BINARY
+
/* Another magical number */
#undef EAI_SYSTEM
@@ -95,6 +98,9 @@
/* Define to 1 if you have the `dup2' function. */
#undef HAVE_DUP2
+/* Define to 1 if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
+
/* Define to 1 if you have the <execinfo.h> header file. */
#undef HAVE_EXECINFO_H
@@ -199,6 +205,9 @@
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
+/* Define to 1 if you have the <math.h> header file. */
+#undef HAVE_MATH_H
+
/* If Memcached binary is available */
#undef HAVE_MEMCACHED_BINARY
@@ -247,6 +256,9 @@
/* Define if you have POSIX threads libraries and header files. */
#undef HAVE_PTHREAD
+/* Define to 1 if you have the <pthread.h> header file. */
+#undef HAVE_PTHREAD_H
+
/* Have PTHREAD_PRIO_INHERIT. */
#undef HAVE_PTHREAD_PRIO_INHERIT
@@ -278,6 +290,9 @@
/* Define to 1 if you have the `sqrt' function. */
#undef HAVE_SQRT
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
+
/* Define to 1 if stdbool.h conforms to C99. */
#undef HAVE_STDBOOL_H
@@ -672,17 +687,9 @@
# define HAVE_ULONG 1
typedef unsigned long int ulong;
#endif
+
+#define RPACKAGE "memcached"
+#define RVERSION "1.4.13"
-#if defined(RMEMCACHED_PACKAGE)
-#undef VERSION
-#define VERSION VERSION_NUMBER
-#endif
-
-#if defined(RMEMCACHED_PACKAGE)
-#undef PACKAGE
-#define PACKAGE RMEMCACHED_PACKAGE
-#endif
-
-
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/configure
^
|
| @@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libmemcached 1.0.6.
+# Generated by GNU Autoconf 2.68 for libmemcached 1.0.7.
#
# Report bugs to <http://libmemcached.org/>.
#
@@ -570,8 +570,8 @@
# Identity of this package.
PACKAGE_NAME='libmemcached'
PACKAGE_TARNAME='libmemcached'
-PACKAGE_VERSION='1.0.6'
-PACKAGE_STRING='libmemcached 1.0.6'
+PACKAGE_VERSION='1.0.7'
+PACKAGE_STRING='libmemcached 1.0.7'
PACKAGE_BUGREPORT='http://libmemcached.org/'
PACKAGE_URL=''
@@ -651,6 +651,8 @@
ax_pthread_config
BUILDING_GEARMAN_FALSE
BUILDING_GEARMAN_TRUE
+HAVE_LIBDRIZZLE_FALSE
+HAVE_LIBDRIZZLE_TRUE
HAVE_LIBMEMCACHED_FALSE
HAVE_LIBMEMCACHED_TRUE
BUILDING_LIBMEMCACHED_FALSE
@@ -1447,7 +1449,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libmemcached 1.0.6 to adapt to many kinds of systems.
+\`configure' configures libmemcached 1.0.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1518,7 +1520,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libmemcached 1.0.6:";;
+ short | recursive ) echo "Configuration of libmemcached 1.0.7:";;
esac
cat <<\_ACEOF
@@ -1672,7 +1674,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libmemcached configure 1.0.6
+libmemcached configure 1.0.7
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2898,7 +2900,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libmemcached $as_me 1.0.6, which was
+It was created by libmemcached $as_me 1.0.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3830,7 +3832,7 @@
# Define the identity of the package.
PACKAGE='libmemcached'
- VERSION='1.0.6'
+ VERSION='1.0.7'
cat >>confdefs.h <<_ACEOF
@@ -6313,7 +6315,7 @@
# Define the identity of the package.
PACKAGE='libmemcached'
- VERSION='1.0.6'
+ VERSION='1.0.7'
cat >>confdefs.h <<_ACEOF
@@ -20350,6 +20352,14 @@
HAVE_LIBMEMCACHED_FALSE=
fi
+ if false; then
+ HAVE_LIBDRIZZLE_TRUE=
+ HAVE_LIBDRIZZLE_FALSE='#'
+else
+ HAVE_LIBDRIZZLE_TRUE='#'
+ HAVE_LIBDRIZZLE_FALSE=
+fi
+
$as_echo "#define HAVE_LIBMEMCACHED 1" >>confdefs.h
@@ -21897,6 +21907,30 @@
done
+for ac_header in errno.h
+do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
+if test "x$ac_cv_header_errno_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_ERRNO_H 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in execinfo.h
+do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
+if test "x$ac_cv_header_execinfo_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_EXECINFO_H 1
+_ACEOF
+
+fi
+
+done
+
for ac_header in fcntl.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
@@ -21909,6 +21943,18 @@
done
+for ac_header in inttypes.h
+do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
+if test "x$ac_cv_header_inttypes_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_INTTYPES_H 1
+_ACEOF
+
+fi
+
+done
+
for ac_header in libintl.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
@@ -21945,6 +21991,18 @@
done
+for ac_header in math.h
+do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default"
+if test "x$ac_cv_header_math_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_MATH_H 1
+_ACEOF
+
+fi
+
+done
+
for ac_header in netdb.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default"
@@ -21969,6 +22027,30 @@
done
+for ac_header in pthread.h
+do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_H 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in stdarg.h
+do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdarg_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_STDARG_H 1
+_ACEOF
+
+fi
+
+done
+
for ac_header in stddef.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"
@@ -21981,6 +22063,18 @@
done
+for ac_header in stdlib.h
+do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_STDLIB_H 1
+_ACEOF
+
+fi
+
+done
+
for ac_header in sys/time.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
@@ -21993,12 +22087,12 @@
done
-for ac_header in execinfo.h
+for ac_header in unistd.h
do :
- ac_fn_cxx_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
-if test "x$ac_cv_header_execinfo_h" = xyes; then :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+if test "x$ac_cv_header_unistd_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_EXECINFO_H 1
+#define HAVE_UNISTD_H 1
_ACEOF
fi
@@ -23866,6 +23960,9 @@
$as_echo "#define HAVE_DRIZZLED_BINARY 0" >>confdefs.h
+$as_echo "#define DRIZZLED_BINARY 0" >>confdefs.h
+
+
$as_echo "#define GEARMAND_BLOBSLAP_WORKER 0" >>confdefs.h
@@ -24443,6 +24540,10 @@
as_fn_error $? "conditional \"HAVE_LIBMEMCACHED\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_LIBDRIZZLE_TRUE}" && test -z "${HAVE_LIBDRIZZLE_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_LIBDRIZZLE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${BUILDING_GEARMAN_TRUE}" && test -z "${BUILDING_GEARMAN_FALSE}"; then
as_fn_error $? "conditional \"BUILDING_GEARMAN\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -24894,7 +24995,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libmemcached $as_me 1.0.6, which was
+This file was extended by libmemcached $as_me 1.0.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24960,7 +25061,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libmemcached config.status 1.0.6
+libmemcached config.status 1.0.7
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/configure.ac
^
|
| @@ -7,7 +7,7 @@
# Use and distribution licensed under the BSD license. See
# the COPYING file in this directory for full text.
-AC_INIT([libmemcached],[1.0.6],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.7],[http://libmemcached.org/])
AC_CONFIG_AUX_DIR(config)
@@ -71,6 +71,7 @@
AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true)
AM_CONDITIONAL(HAVE_LIBMEMCACHED, false)
+AM_CONDITIONAL(HAVE_LIBDRIZZLE, false)
AC_DEFINE([HAVE_LIBMEMCACHED], [1], [Enables libmemcached Support])
AM_CONDITIONAL(BUILDING_GEARMAN, false)
@@ -121,15 +122,22 @@
AC_CHECK_FUNCS([strtoull])
AC_CHECK_HEADERS([arpa/inet.h])
+AC_CHECK_HEADERS([errno.h])
+AC_CHECK_HEADERS([execinfo.h])
AC_CHECK_HEADERS([fcntl.h])
+AC_CHECK_HEADERS([inttypes.h])
AC_CHECK_HEADERS([libintl.h])
AC_CHECK_HEADERS([limits.h])
AC_CHECK_HEADERS([malloc.h])
+AC_CHECK_HEADERS([math.h])
AC_CHECK_HEADERS([netdb.h])
AC_CHECK_HEADERS([netinet/in.h])
+AC_CHECK_HEADERS([pthread.h])
+AC_CHECK_HEADERS([stdarg.h])
AC_CHECK_HEADERS([stddef.h])
+AC_CHECK_HEADERS([stdlib.h])
AC_CHECK_HEADERS([sys/time.h])
-AC_CHECK_HEADERS([execinfo.h])
+AC_CHECK_HEADERS([unistd.h])
AC_CHECK_HEADERS([cxxabi.h],
AC_DEFINE([HAVE_CXXABI_H], [1], [Have cxxabi.h]),
AC_DEFINE([HAVE_CXXABI_H], [0], [Have cxxabi.h]))
@@ -218,6 +226,7 @@
AC_DEFINE([HAVE_LIBDRIZZLE], [0], [Support for libdrizzle])
AC_DEFINE([HAVE_DRIZZLED_BINARY], [0], [Support for DrizzleD])
+AC_DEFINE([DRIZZLED_BINARY], [0], [Support for DrizzleD])
AC_DEFINE([GEARMAND_BLOBSLAP_WORKER], [0], [Support for Gearman Blobslap worker])
AC_DEFINE([HAVE_LIBPQ], [0], [Support for Postgres])
AC_DEFINE([HAVE_LIBCURL], [0], [Support for libcurl])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_clone.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_CLONE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_CLONE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_clone \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_crc32.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_CRC32" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_CRC32" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_crc32 \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_create.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_CREATE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_CREATE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_create \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_fnv1_32.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_FNV1_32" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_FNV1_32" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_fnv1_32 \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_fnv1_64.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_FNV1_64" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_FNV1_64" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_fnv1_64 \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_fnv1a_32.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_FNV1A_32" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_FNV1A_32" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_fnv1a_32 \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_fnv1a_64.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_FNV1A_64" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_FNV1A_64" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_fnv1a_64 \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_free.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_FREE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_FREE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_free \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_functions.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_FUNCTIONS" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_FUNCTIONS" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_functions \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_hsieh.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_HSIEH" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_HSIEH" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_hsieh \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_is_allocated.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_IS_ALLOCATED" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_IS_ALLOCATED" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_is_allocated \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_jenkins.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_JENKINS" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_JENKINS" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_jenkins \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_md5.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_MD5" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_MD5" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_md5 \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_murmur.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_MURMUR" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_MURMUR" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_murmur \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/hashkit_value.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_VALUE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "HASHKIT_VALUE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
hashkit_value \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/libhashkit.3
^
|
| @@ -1,4 +1,4 @@
-.TH "LIBHASHKIT" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "LIBHASHKIT" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
libhashkit \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/libmemcached.3
^
|
| @@ -1,4 +1,4 @@
-.TH "LIBMEMCACHED" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "LIBMEMCACHED" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
libmemcached \- Introducing the C Client Library for memcached
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/libmemcached_check_configuration.3
^
|
| @@ -1,4 +1,4 @@
-.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
libmemcached_check_configuration \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/libmemcached_configuration.3
^
|
| @@ -1,4 +1,4 @@
-.TH "LIBMEMCACHED_CONFIGURATION" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "LIBMEMCACHED_CONFIGURATION" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
libmemcached_configuration \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/libmemcached_examples.3
^
|
| @@ -1,4 +1,4 @@
-.TH "LIBMEMCACHED_EXAMPLES" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "LIBMEMCACHED_EXAMPLES" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
libmemcached_examples \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/libmemcachedutil.3
^
|
| @@ -1,4 +1,4 @@
-.TH "LIBMEMCACHEDUTIL" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "LIBMEMCACHEDUTIL" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
libmemcachedutil \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memaslap.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMASLAP" "1" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMASLAP" "1" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memaslap \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_add.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_ADD" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_ADD" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_add \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_add_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_ADD_BY_KEY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_ADD_BY_KEY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_add_by_key \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_analyze.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_ANALYZE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_ANALYZE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_analyze \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_append.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_APPEND" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_APPEND" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_append \- Appending to or Prepending to data on the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_append_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_APPEND_BY_KEY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_APPEND_BY_KEY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_append_by_key \- Appending to or Prepending to data on the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_behavior_get.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_BEHAVIOR_GET" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_BEHAVIOR_GET" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_behavior_get \- libmemcached Documentation
.
@@ -181,7 +181,7 @@
.B MEMCACHED_BEHAVIOR_POLL_TIMEOUT
.UNINDENT
.sp
-Modify the timeout value that is used by poll. The default value is \-1. An signed int pointer must be passed to memcached_behavior_set to change this value. For memcached_behavior_get a signed int value will be cast and returned as the unsigned long long.
+Modify the timeout value that is used by poll. The default value is \-1. An signed int must be passed to memcached_behavior_set to change this value (this requires casting). For memcached_behavior_get a signed int value will be cast and returned as the unsigned long long.
.INDENT 0.0
.TP
.B MEMCACHED_BEHAVIOR_USER_DATA
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_behavior_set.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_BEHAVIOR_SET" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_BEHAVIOR_SET" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_behavior_set \- libmemcached Documentation
.
@@ -181,7 +181,7 @@
.B MEMCACHED_BEHAVIOR_POLL_TIMEOUT
.UNINDENT
.sp
-Modify the timeout value that is used by poll. The default value is \-1. An signed int pointer must be passed to memcached_behavior_set to change this value. For memcached_behavior_get a signed int value will be cast and returned as the unsigned long long.
+Modify the timeout value that is used by poll. The default value is \-1. An signed int must be passed to memcached_behavior_set to change this value (this requires casting). For memcached_behavior_get a signed int value will be cast and returned as the unsigned long long.
.INDENT 0.0
.TP
.B MEMCACHED_BEHAVIOR_USER_DATA
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_callback_get.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_CALLBACK_GET" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_CALLBACK_GET" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_callback_get \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_callback_set.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_CALLBACK_SET" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_CALLBACK_SET" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_callback_set \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_cas.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_CAS" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_CAS" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_cas \- Working with data on the server in an atomic fashion
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_cas_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_CAS_BY_KEY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_CAS_BY_KEY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_cas_by_key \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_clone.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_CLONE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_CLONE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_clone \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_create.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_CREATE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_CREATE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_create \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_decrement.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_DECREMENT" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_DECREMENT" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_decrement \- Incrementing and Decrementing Values
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_decrement_with_initial.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_decrement_with_initial \- Incrementing and Decrementing Values
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_delete.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_DELETE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_DELETE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_delete \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_delete_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_DELETE_BY_KEY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_DELETE_BY_KEY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_delete_by_key \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_destroy_sasl_auth_data.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_destroy_sasl_auth_data \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_dump.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_DUMP" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_DUMP" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_dump \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_exist.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_EXIST" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_EXIST" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_exist \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_exist_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_EXIST_BY_KEY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_EXIST_BY_KEY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_exist_by_key \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_fetch.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_FETCH" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_FETCH" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_fetch \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_fetch_execute.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_FETCH_EXECUTE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_FETCH_EXECUTE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_fetch_execute \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_fetch_result.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_FETCH_RESULT" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_FETCH_RESULT" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_fetch_result \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_flush_buffers.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_FLUSH_BUFFERS" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_FLUSH_BUFFERS" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_flush_buffers \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_free.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_FREE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_FREE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_free \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_generate_hash.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GENERATE_HASH" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_GENERATE_HASH" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_generate_hash \- Generating hash values directly
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_generate_hash_value.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_generate_hash_value \- Generating hash values directly
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_get.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_GET" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_get \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_get_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET_BY_KEY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_GET_BY_KEY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_get_by_key \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_get_memory_allocators.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_get_memory_allocators \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_get_sasl_callbacks.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_get_sasl_callbacks \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_get_user_data.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET_USER_DATA" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_GET_USER_DATA" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_get_user_data \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_increment.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_INCREMENT" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_INCREMENT" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_increment \- Incrementing and Decrementing Values
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_increment_with_initial.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_increment_with_initial \- Incrementing and Decrementing Values
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_last_error_message.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_LAST_ERROR_MESSAGE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_LAST_ERROR_MESSAGE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_last_error_message \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_lib_version.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_LIB_VERSION" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_LIB_VERSION" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_lib_version \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_mget.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_MGET" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_MGET" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_mget \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_mget_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_MGET_BY_KEY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_MGET_BY_KEY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_mget_by_key \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_mget_execute.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_MGET_EXECUTE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_MGET_EXECUTE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_mget_execute \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_mget_execute_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_mget_execute_by_key \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_pool.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_POOL" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_pool \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_pool_behavior_get.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_pool_behavior_get \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_pool_behavior_set.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_pool_behavior_set \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_pool_create.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_CREATE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_POOL_CREATE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_pool_create \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_pool_destroy.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_DESTROY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_POOL_DESTROY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_pool_destroy \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_pool_fetch.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_FETCH" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_POOL_FETCH" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_pool_fetch \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_pool_pop.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_POP" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_POOL_POP" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_pool_pop \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_pool_push.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_PUSH" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_POOL_PUSH" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_pool_push \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_pool_release.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_RELEASE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_POOL_RELEASE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_pool_release \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_pool_st.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_ST" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_POOL_ST" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_pool_st \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_prepend.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_PREPEND" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_PREPEND" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_prepend \- Appending to or Prepending to data on the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_prepend_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_PREPEND_BY_KEY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_PREPEND_BY_KEY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_prepend_by_key \- Appending to or Prepending to data on the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_quit.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_QUIT" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_QUIT" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_quit \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_replace.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_REPLACE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_REPLACE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_replace \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_replace_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_REPLACE_BY_KEY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_REPLACE_BY_KEY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_replace_by_key \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_sasl_set_auth_data.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_sasl_set_auth_data \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_server_add.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_ADD" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SERVER_ADD" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_server_add \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_server_count.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_COUNT" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SERVER_COUNT" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_server_count \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_server_cursor.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_CURSOR" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SERVER_CURSOR" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_server_cursor \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_server_list.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_LIST" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SERVER_LIST" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_server_list \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_server_list_append.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_server_list_append \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_server_list_count.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_server_list_count \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_server_list_free.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_LIST_FREE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SERVER_LIST_FREE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_server_list_free \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_server_push.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_PUSH" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SERVER_PUSH" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_server_push \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_servers_parse.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVERS_PARSE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SERVERS_PARSE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_servers_parse \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_set.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SET" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_set \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_set_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_BY_KEY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SET_BY_KEY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_set_by_key \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_set_memory_allocators.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_set_memory_allocators \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_set_sasl_callbacks.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_set_sasl_callbacks \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_set_user_data.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_USER_DATA" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_SET_USER_DATA" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_set_user_data \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_stat.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_STAT" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_stat \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_stat_execute.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT_EXECUTE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_STAT_EXECUTE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_stat_execute \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_stat_get_keys.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT_GET_KEYS" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_STAT_GET_KEYS" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_stat_get_keys \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_stat_get_value.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT_GET_VALUE" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_STAT_GET_VALUE" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_stat_get_value \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_stat_servername.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT_SERVERNAME" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_STAT_SERVERNAME" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_stat_servername \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_strerror.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_STRERROR" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_STRERROR" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_strerror \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_touch.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_TOUCH" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_TOUCH" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_touch \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_touch_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_TOUCH_BY_KEY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_TOUCH_BY_KEY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_touch_by_key \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_verbosity.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_VERBOSITY" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_VERBOSITY" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_verbosity \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcached_version.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_VERSION" "3" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCACHED_VERSION" "3" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcached_version \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcapable.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCAPABLE" "1" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCAPABLE" "1" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcapable \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcat.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCAT" "1" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCAT" "1" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcat \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memcp.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCP" "1" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMCP" "1" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memcp \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memdump.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMDUMP" "1" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMDUMP" "1" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memdump \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memerror.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMERROR" "1" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMERROR" "1" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memerror \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memflush.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMFLUSH" "1" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMFLUSH" "1" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memflush \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memrm.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMRM" "1" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMRM" "1" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memrm \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memslap.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMSLAP" "1" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMSLAP" "1" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memslap \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/docs/man/memstat.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMSTAT" "1" "April 09, 2012" "1.0.6" "libmemcached"
+.TH "MEMSTAT" "1" "April 28, 2012" "1.0.7" "libmemcached"
.SH NAME
memstat \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/example/t/include.am
^
|
| @@ -18,6 +18,7 @@
example_t_memcached_light_SOURCES+= example/t/memcached_light.cc
example_t_memcached_light_SOURCES+= tests/libmemcached-1.0/memcached_get.cc
+example_t_memcached_light_SOURCES+= tests/libmemcached-1.0/print.cc
example_t_memcached_light_SOURCES+= tests/libmemcached-1.0/setup_and_teardowns.cc
example_t_memcached_light_CXXFLAGS = $(AM_CXXFLAGS)
example_t_memcached_light_DEPENDENCIES= $(MEMCACHED_LIGHT_TESTS_LDADDS) example/memcached_light
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/example/t/memcached_light.cc
^
|
| @@ -166,8 +166,6 @@
}
};
-static MemcachedLightRunner defualt_libmemcached_runner;
-
test_st cmdline_option_TESTS[] ={
{"--help", true, help_TEST },
{"--verbose", true, verbose_TEST },
@@ -238,6 +236,6 @@
world->_create= world_create;
world->_destroy= world_destroy;
world->collections= collection;
- world->set_runner(&defualt_libmemcached_runner);
+ world->set_runner(new MemcachedLightRunner);
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached-1.0/configure.h
^
|
| @@ -44,8 +44,8 @@
#define LIBMEMCACHED_WITH_SASL_SUPPORT 0
-#define LIBMEMCACHED_VERSION_STRING "1.0.6"
-#define LIBMEMCACHED_VERSION_HEX 0x01000006
+#define LIBMEMCACHED_VERSION_STRING "1.0.7"
+#define LIBMEMCACHED_VERSION_HEX 0x01000007
#ifdef __cplusplus
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached-1.0/exist.h
^
|
| @@ -36,8 +36,10 @@
#pragma once
+LIBMEMCACHED_API
memcached_return_t memcached_exist(memcached_st *memc, const char *key, size_t key_length);
+LIBMEMCACHED_API
memcached_return_t memcached_exist_by_key(memcached_st *memc,
const char *group_key, size_t group_key_length,
const char *key, size_t key_length);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached-1.0/struct/server.h
^
|
| @@ -85,7 +85,7 @@
uint32_t timeouts;
} io_wait_count;
uint8_t major_version; // Default definition of UINT8_MAX means that it has not been set.
- uint8_t micro_version; // ditto
+ uint8_t micro_version; // ditto, and note that this is the third, not second version bit
uint8_t minor_version; // ditto
memcached_connection_t type;
char *read_ptr;
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/allocators.cc
^
|
| @@ -41,18 +41,18 @@
{
if (mem)
{
- free(mem);
+ std::free(mem);
}
}
void *_libmemcached_malloc(const memcached_st *, size_t size, void *)
{
- return malloc(size);
+ return std::malloc(size);
}
void *_libmemcached_realloc(const memcached_st*, void *mem, size_t size, void *)
{
- return realloc(mem, size);
+ return std::realloc(mem, size);
}
void *_libmemcached_calloc(const memcached_st *self, size_t nelem, size_t size, void *context)
@@ -68,7 +68,7 @@
return ret;
}
- return calloc(nelem, size);
+ return std::calloc(nelem, size);
}
struct memcached_allocator_t memcached_allocators_return_default(void)
@@ -126,8 +126,23 @@
return;
}
- *mem_malloc= self->allocators.malloc;
- *mem_free= self->allocators.free;
- *mem_realloc= self->allocators.realloc;
- *mem_calloc= self->allocators.calloc;
+ if (mem_malloc)
+ {
+ *mem_malloc= self->allocators.malloc;
+ }
+
+ if (mem_free)
+ {
+ *mem_free= self->allocators.free;
+ }
+
+ if (mem_realloc)
+ {
+ *mem_realloc= self->allocators.realloc;
+ }
+
+ if (mem_calloc)
+ {
+ *mem_calloc= self->allocators.calloc;
+ }
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/analyze.cc
^
|
| @@ -42,7 +42,9 @@
const uint64_t total_bytes)
{
if (total_items > 0 && total_bytes > 0)
+ {
result->average_item_size= (uint32_t) (total_bytes / total_items);
+ }
}
static void calc_hit_ratio(memcached_analysis_st *result,
@@ -65,19 +67,25 @@
{
uint64_t total_items= 0, total_bytes= 0;
uint64_t total_get_cmds= 0, total_get_hits= 0;
- uint32_t server_count;
- if (not memc or not memc_stat)
+ if (memc == NULL or memc_stat == NULL)
{
return NULL;
}
+ memcached_return_t not_used;
+ if (error == NULL)
+ {
+ error= ¬_used;
+ }
+
*error= MEMCACHED_SUCCESS;
- server_count= memcached_server_count(memc);
- memcached_analysis_st *result= (memcached_analysis_st*)calloc(memcached_server_count(memc),
- sizeof(memcached_analysis_st));
+ uint32_t server_count= memcached_server_count(memc);
+ memcached_analysis_st *result= (memcached_analysis_st*)libmemcached_xcalloc(memc,
+ memcached_server_count(memc),
+ memcached_analysis_st);
- if (not result)
+ if (result == NULL)
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;
@@ -107,5 +115,5 @@
void memcached_analyze_free(memcached_analysis_st *ptr)
{
- free(ptr);
+ libmemcached_free(ptr->root, ptr);
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/backtrace.cc
^
|
| @@ -69,11 +69,11 @@
fprintf(stderr, "Number of stack frames obtained: %lu\n", (unsigned long)size);
- char *named_function= (char *)::realloc(NULL, 1024);
+ char *named_function= (char *)std::realloc(NULL, 1024);
if (named_function == NULL)
{
- ::free(strings);
+ std::free(strings);
return;
}
@@ -82,7 +82,7 @@
if (USE_DEMANGLE)
{
size_t sz= 200;
- char *named_function_ptr= (char *)::realloc(named_function, sz);
+ char *named_function_ptr= (char *)std::realloc(named_function, sz);
if (named_function_ptr == NULL)
{
continue;
@@ -139,7 +139,7 @@
}
}
- ::free(named_function);
- ::free(strings);
+ std::free(named_function);
+ std::free(strings);
#endif // HAVE_EXECINFO_H
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/common.h
^
|
| @@ -49,17 +49,19 @@
#include <cstdlib>
#include <cstring>
#include <ctime>
-#include <ctype.h>
+#include <cctype>
+#include <cerrno>
+#include <climits>
#else
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <errno.h>
+#include <limits.h>
#endif
-#include <errno.h>
#include <fcntl.h>
-#include <limits.h>
#include <sys/types.h>
#include <unistd.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/csl/include.am
^
|
| @@ -2,20 +2,17 @@
# included from Top Level Makefile.am
# All paths should be given relative to the root
-DISTCLEANFILES+= \
- libmemcached/csl/parser.output
+DISTCLEANFILES+= libmemcached/csl/parser.output
-noinst_HEADERS+= \
- libmemcached/csl/common.h \
- libmemcached/csl/context.h \
- libmemcached/csl/parser.h \
- libmemcached/csl/scanner.h \
- libmemcached/csl/server.h \
- libmemcached/csl/symbol.h
+noinst_HEADERS+= libmemcached/csl/common.h
+noinst_HEADERS+= libmemcached/csl/context.h
+noinst_HEADERS+= libmemcached/csl/parser.h
+noinst_HEADERS+= libmemcached/csl/scanner.h
+noinst_HEADERS+= libmemcached/csl/server.h
+noinst_HEADERS+= libmemcached/csl/symbol.h
-libmemcached_libmemcached_la_SOURCES+= \
- libmemcached/csl/context.cc \
- libmemcached/csl/parser.cc \
- libmemcached/csl/scanner.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/csl/context.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/csl/parser.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/csl/scanner.cc
include libmemcached/csl/parser.am
|
|
[-]
[+]
|
Added |
libmemcached-1.0.7.tar.bz2/libmemcached/csl/parser.am
^
|
| @@ -0,0 +1,16 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+EXTRA_DIST+= libmemcached/csl/parser.yy
+EXTRA_DIST+= libmemcached/csl/scanner.l
+
+libmemcached/csl/parser.h: libmemcached/csl/parser.cc
+
+libmemcached/csl/parser.cc: libmemcached/csl/parser.yy libmemcached/csl/scanner.l libmemcached/csl/scanner.h
+ $(AM_V_YACC)$(am__skipyacc) $(YACC) $(YLFLAGS) $(AM_YFLAGS) -o $@ $<
+
+libmemcached/csl/scanner.h: libmemcached/csl/scanner.cc
+
+libmemcached/csl/scanner.cc: libmemcached/csl/scanner.l libmemcached/csl/parser.yy
+ $(AM_V_GEN)$(LEX) $<
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/csl/parser.cc
^
|
| @@ -74,7 +74,7 @@
/* Copy the first part of user declarations. */
/* Line 268 of yacc.c */
-#line 36 "libmemcached/csl/parser.yy"
+#line 52 "libmemcached/csl/parser.yy"
#include <libmemcached/csl/common.h>
@@ -540,13 +540,13 @@
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 172, 172, 173, 177, 179, 181, 183, 188, 193,
- 197, 201, 212, 222, 232, 241, 245, 249, 253, 257,
- 269, 282, 295, 302, 309, 318, 324, 328, 332, 336,
- 340, 344, 348, 352, 356, 360, 364, 368, 375, 379,
- 383, 387, 391, 395, 399, 403, 407, 411, 415, 419,
- 426, 427, 432, 433, 438, 442, 446, 450, 454, 458,
- 462, 466, 470, 477, 481, 488, 492, 496
+ 0, 188, 188, 189, 193, 195, 197, 199, 204, 209,
+ 213, 217, 228, 238, 248, 257, 261, 265, 269, 273,
+ 285, 298, 311, 318, 325, 334, 340, 344, 348, 352,
+ 356, 360, 364, 368, 372, 376, 380, 384, 391, 395,
+ 399, 403, 407, 411, 415, 419, 423, 427, 431, 435,
+ 442, 443, 448, 449, 454, 458, 462, 466, 470, 474,
+ 478, 482, 486, 493, 497, 504, 508, 512
};
#endif
@@ -1557,28 +1557,28 @@
case 4:
/* Line 1806 of yacc.c */
-#line 178 "libmemcached/csl/parser.yy"
+#line 194 "libmemcached/csl/parser.yy"
{ }
break;
case 5:
/* Line 1806 of yacc.c */
-#line 180 "libmemcached/csl/parser.yy"
+#line 196 "libmemcached/csl/parser.yy"
{ }
break;
case 6:
/* Line 1806 of yacc.c */
-#line 182 "libmemcached/csl/parser.yy"
+#line 198 "libmemcached/csl/parser.yy"
{ }
break;
case 7:
/* Line 1806 of yacc.c */
-#line 184 "libmemcached/csl/parser.yy"
+#line 200 "libmemcached/csl/parser.yy"
{
context->set_end();
YYACCEPT;
@@ -1588,7 +1588,7 @@
case 8:
/* Line 1806 of yacc.c */
-#line 189 "libmemcached/csl/parser.yy"
+#line 205 "libmemcached/csl/parser.yy"
{
context->rc= MEMCACHED_PARSE_USER_ERROR;
parser_abort(context, "ERROR called directly");
@@ -1598,7 +1598,7 @@
case 9:
/* Line 1806 of yacc.c */
-#line 194 "libmemcached/csl/parser.yy"
+#line 210 "libmemcached/csl/parser.yy"
{
memcached_reset(context->memc);
}
@@ -1607,7 +1607,7 @@
case 10:
/* Line 1806 of yacc.c */
-#line 198 "libmemcached/csl/parser.yy"
+#line 214 "libmemcached/csl/parser.yy"
{
yydebug= 1;
}
@@ -1616,7 +1616,7 @@
case 11:
/* Line 1806 of yacc.c */
-#line 202 "libmemcached/csl/parser.yy"
+#line 218 "libmemcached/csl/parser.yy"
{
if ((context->rc= memcached_parse_configure_file(*context->memc, (yyvsp[(3) - (3)].string).c_str, (yyvsp[(3) - (3)].string).size)) != MEMCACHED_SUCCESS)
{
@@ -1628,7 +1628,7 @@
case 12:
/* Line 1806 of yacc.c */
-#line 213 "libmemcached/csl/parser.yy"
+#line 229 "libmemcached/csl/parser.yy"
{
if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(3) - (4)].number), (yyvsp[(4) - (4)].number))))
{
@@ -1643,7 +1643,7 @@
case 13:
/* Line 1806 of yacc.c */
-#line 223 "libmemcached/csl/parser.yy"
+#line 239 "libmemcached/csl/parser.yy"
{
if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(3) - (4)].number), (yyvsp[(4) - (4)].number))))
{
@@ -1658,7 +1658,7 @@
case 14:
/* Line 1806 of yacc.c */
-#line 233 "libmemcached/csl/parser.yy"
+#line 249 "libmemcached/csl/parser.yy"
{
if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, (yyvsp[(2) - (3)].string).c_str, (yyvsp[(3) - (3)].number))))
{
@@ -1672,7 +1672,7 @@
case 15:
/* Line 1806 of yacc.c */
-#line 242 "libmemcached/csl/parser.yy"
+#line 258 "libmemcached/csl/parser.yy"
{
memcached_set_configuration_file(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).size);
}
@@ -1681,7 +1681,7 @@
case 16:
/* Line 1806 of yacc.c */
-#line 246 "libmemcached/csl/parser.yy"
+#line 262 "libmemcached/csl/parser.yy"
{
context->memc->configure.initial_pool_size= (yyvsp[(2) - (2)].number);
}
@@ -1690,7 +1690,7 @@
case 17:
/* Line 1806 of yacc.c */
-#line 250 "libmemcached/csl/parser.yy"
+#line 266 "libmemcached/csl/parser.yy"
{
context->memc->configure.max_pool_size= (yyvsp[(2) - (2)].number);
}
@@ -1699,7 +1699,7 @@
case 19:
/* Line 1806 of yacc.c */
-#line 258 "libmemcached/csl/parser.yy"
+#line 274 "libmemcached/csl/parser.yy"
{
if (memcached_callback_get(context->memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL))
{
@@ -1716,7 +1716,7 @@
case 20:
/* Line 1806 of yacc.c */
-#line 270 "libmemcached/csl/parser.yy"
+#line 286 "libmemcached/csl/parser.yy"
{
// Check to see if DISTRIBUTION has already been set
if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (2)].distribution))) != MEMCACHED_SUCCESS)
@@ -1734,7 +1734,7 @@
case 21:
/* Line 1806 of yacc.c */
-#line 283 "libmemcached/csl/parser.yy"
+#line 299 "libmemcached/csl/parser.yy"
{
// Check to see if DISTRIBUTION has already been set
if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (4)].distribution))) != MEMCACHED_SUCCESS)
@@ -1752,7 +1752,7 @@
case 22:
/* Line 1806 of yacc.c */
-#line 296 "libmemcached/csl/parser.yy"
+#line 312 "libmemcached/csl/parser.yy"
{
if (context->set_hash((yyvsp[(2) - (2)].hash)) == false)
{
@@ -1764,7 +1764,7 @@
case 23:
/* Line 1806 of yacc.c */
-#line 303 "libmemcached/csl/parser.yy"
+#line 319 "libmemcached/csl/parser.yy"
{
if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (2)].behavior), (yyvsp[(2) - (2)].number))) != MEMCACHED_SUCCESS)
{
@@ -1776,7 +1776,7 @@
case 24:
/* Line 1806 of yacc.c */
-#line 310 "libmemcached/csl/parser.yy"
+#line 326 "libmemcached/csl/parser.yy"
{
if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (1)].behavior), true)) != MEMCACHED_SUCCESS)
{
@@ -1790,7 +1790,7 @@
case 25:
/* Line 1806 of yacc.c */
-#line 319 "libmemcached/csl/parser.yy"
+#line 335 "libmemcached/csl/parser.yy"
{
}
break;
@@ -1798,7 +1798,7 @@
case 26:
/* Line 1806 of yacc.c */
-#line 325 "libmemcached/csl/parser.yy"
+#line 341 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS;
}
@@ -1807,7 +1807,7 @@
case 27:
/* Line 1806 of yacc.c */
-#line 329 "libmemcached/csl/parser.yy"
+#line 345 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT;
}
@@ -1816,7 +1816,7 @@
case 28:
/* Line 1806 of yacc.c */
-#line 333 "libmemcached/csl/parser.yy"
+#line 349 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK;
}
@@ -1825,7 +1825,7 @@
case 29:
/* Line 1806 of yacc.c */
-#line 337 "libmemcached/csl/parser.yy"
+#line 353 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK;
}
@@ -1834,7 +1834,7 @@
case 30:
/* Line 1806 of yacc.c */
-#line 341 "libmemcached/csl/parser.yy"
+#line 357 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH;
}
@@ -1843,7 +1843,7 @@
case 31:
/* Line 1806 of yacc.c */
-#line 345 "libmemcached/csl/parser.yy"
+#line 361 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS;
}
@@ -1852,7 +1852,7 @@
case 32:
/* Line 1806 of yacc.c */
-#line 349 "libmemcached/csl/parser.yy"
+#line 365 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_POLL_TIMEOUT;
}
@@ -1861,7 +1861,7 @@
case 33:
/* Line 1806 of yacc.c */
-#line 353 "libmemcached/csl/parser.yy"
+#line 369 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_RCV_TIMEOUT;
}
@@ -1870,7 +1870,7 @@
case 34:
/* Line 1806 of yacc.c */
-#line 357 "libmemcached/csl/parser.yy"
+#line 373 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT;
}
@@ -1879,7 +1879,7 @@
case 35:
/* Line 1806 of yacc.c */
-#line 361 "libmemcached/csl/parser.yy"
+#line 377 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SND_TIMEOUT;
}
@@ -1888,7 +1888,7 @@
case 36:
/* Line 1806 of yacc.c */
-#line 365 "libmemcached/csl/parser.yy"
+#line 381 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE;
}
@@ -1897,7 +1897,7 @@
case 37:
/* Line 1806 of yacc.c */
-#line 369 "libmemcached/csl/parser.yy"
+#line 385 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE;
}
@@ -1906,7 +1906,7 @@
case 38:
/* Line 1806 of yacc.c */
-#line 376 "libmemcached/csl/parser.yy"
+#line 392 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL;
}
@@ -1915,7 +1915,7 @@
case 39:
/* Line 1806 of yacc.c */
-#line 380 "libmemcached/csl/parser.yy"
+#line 396 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
}
@@ -1924,7 +1924,7 @@
case 40:
/* Line 1806 of yacc.c */
-#line 384 "libmemcached/csl/parser.yy"
+#line 400 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
}
@@ -1933,7 +1933,7 @@
case 41:
/* Line 1806 of yacc.c */
-#line 388 "libmemcached/csl/parser.yy"
+#line 404 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_NOREPLY;
}
@@ -1942,7 +1942,7 @@
case 42:
/* Line 1806 of yacc.c */
-#line 392 "libmemcached/csl/parser.yy"
+#line 408 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ;
}
@@ -1951,7 +1951,7 @@
case 43:
/* Line 1806 of yacc.c */
-#line 396 "libmemcached/csl/parser.yy"
+#line 412 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SORT_HOSTS;
}
@@ -1960,7 +1960,7 @@
case 44:
/* Line 1806 of yacc.c */
-#line 400 "libmemcached/csl/parser.yy"
+#line 416 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SUPPORT_CAS;
}
@@ -1969,7 +1969,7 @@
case 45:
/* Line 1806 of yacc.c */
-#line 404 "libmemcached/csl/parser.yy"
+#line 420 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_NODELAY;
}
@@ -1978,7 +1978,7 @@
case 46:
/* Line 1806 of yacc.c */
-#line 408 "libmemcached/csl/parser.yy"
+#line 424 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPALIVE;
}
@@ -1987,7 +1987,7 @@
case 47:
/* Line 1806 of yacc.c */
-#line 412 "libmemcached/csl/parser.yy"
+#line 428 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPIDLE;
}
@@ -1996,7 +1996,7 @@
case 48:
/* Line 1806 of yacc.c */
-#line 416 "libmemcached/csl/parser.yy"
+#line 432 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_USE_UDP;
}
@@ -2005,7 +2005,7 @@
case 49:
/* Line 1806 of yacc.c */
-#line 420 "libmemcached/csl/parser.yy"
+#line 436 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_VERIFY_KEY;
}
@@ -2014,35 +2014,35 @@
case 50:
/* Line 1806 of yacc.c */
-#line 426 "libmemcached/csl/parser.yy"
+#line 442 "libmemcached/csl/parser.yy"
{ (yyval.number)= MEMCACHED_DEFAULT_PORT;}
break;
case 51:
/* Line 1806 of yacc.c */
-#line 428 "libmemcached/csl/parser.yy"
+#line 444 "libmemcached/csl/parser.yy"
{ }
break;
case 52:
/* Line 1806 of yacc.c */
-#line 432 "libmemcached/csl/parser.yy"
+#line 448 "libmemcached/csl/parser.yy"
{ (yyval.number)= 1; }
break;
case 53:
/* Line 1806 of yacc.c */
-#line 434 "libmemcached/csl/parser.yy"
+#line 450 "libmemcached/csl/parser.yy"
{ }
break;
case 54:
/* Line 1806 of yacc.c */
-#line 439 "libmemcached/csl/parser.yy"
+#line 455 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_MD5;
}
@@ -2051,7 +2051,7 @@
case 55:
/* Line 1806 of yacc.c */
-#line 443 "libmemcached/csl/parser.yy"
+#line 459 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_CRC;
}
@@ -2060,7 +2060,7 @@
case 56:
/* Line 1806 of yacc.c */
-#line 447 "libmemcached/csl/parser.yy"
+#line 463 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1_64;
}
@@ -2069,7 +2069,7 @@
case 57:
/* Line 1806 of yacc.c */
-#line 451 "libmemcached/csl/parser.yy"
+#line 467 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1A_64;
}
@@ -2078,7 +2078,7 @@
case 58:
/* Line 1806 of yacc.c */
-#line 455 "libmemcached/csl/parser.yy"
+#line 471 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1_32;
}
@@ -2087,7 +2087,7 @@
case 59:
/* Line 1806 of yacc.c */
-#line 459 "libmemcached/csl/parser.yy"
+#line 475 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1A_32;
}
@@ -2096,7 +2096,7 @@
case 60:
/* Line 1806 of yacc.c */
-#line 463 "libmemcached/csl/parser.yy"
+#line 479 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_HSIEH;
}
@@ -2105,7 +2105,7 @@
case 61:
/* Line 1806 of yacc.c */
-#line 467 "libmemcached/csl/parser.yy"
+#line 483 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_MURMUR;
}
@@ -2114,7 +2114,7 @@
case 62:
/* Line 1806 of yacc.c */
-#line 471 "libmemcached/csl/parser.yy"
+#line 487 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_JENKINS;
}
@@ -2123,7 +2123,7 @@
case 63:
/* Line 1806 of yacc.c */
-#line 478 "libmemcached/csl/parser.yy"
+#line 494 "libmemcached/csl/parser.yy"
{
(yyval.string)= (yyvsp[(1) - (1)].string);
}
@@ -2132,7 +2132,7 @@
case 64:
/* Line 1806 of yacc.c */
-#line 482 "libmemcached/csl/parser.yy"
+#line 498 "libmemcached/csl/parser.yy"
{
(yyval.string)= (yyvsp[(1) - (1)].string);
}
@@ -2141,7 +2141,7 @@
case 65:
/* Line 1806 of yacc.c */
-#line 489 "libmemcached/csl/parser.yy"
+#line 505 "libmemcached/csl/parser.yy"
{
(yyval.distribution)= MEMCACHED_DISTRIBUTION_CONSISTENT;
}
@@ -2150,7 +2150,7 @@
case 66:
/* Line 1806 of yacc.c */
-#line 493 "libmemcached/csl/parser.yy"
+#line 509 "libmemcached/csl/parser.yy"
{
(yyval.distribution)= MEMCACHED_DISTRIBUTION_MODULA;
}
@@ -2159,7 +2159,7 @@
case 67:
/* Line 1806 of yacc.c */
-#line 497 "libmemcached/csl/parser.yy"
+#line 513 "libmemcached/csl/parser.yy"
{
(yyval.distribution)= MEMCACHED_DISTRIBUTION_RANDOM;
}
@@ -2399,7 +2399,7 @@
/* Line 2067 of yacc.c */
-#line 502 "libmemcached/csl/parser.yy"
+#line 518 "libmemcached/csl/parser.yy"
void Context::start()
|
|
[-]
[+]
|
Added |
libmemcached-1.0.7.tar.bz2/libmemcached/csl/parser.yy
^
|
| @@ -0,0 +1,524 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Libmemcached library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
+ *
+ */
+
+%error-verbose
+%debug
+%defines
+%expect 0
+%output "libmemcached/csl/parser.cc"
+%defines "libmemcached/csl/parser.h"
+%lex-param { yyscan_t *scanner }
+%name-prefix="config_"
+%parse-param { Context *context }
+%parse-param { yyscan_t *scanner }
+%pure-parser
+%require "2.4"
+%start begin
+%verbose
+
+%{
+
+#include <libmemcached/csl/common.h>
+#include <libmemcached/options.hpp>
+
+#include <libmemcached/csl/context.h>
+#include <libmemcached/csl/symbol.h>
+#include <libmemcached/csl/scanner.h>
+
+#ifndef __INTEL_COMPILER
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+
+int conf_lex(YYSTYPE* lvalp, void* scanner);
+
+#define select_yychar(__context) yychar == UNKNOWN ? ( (__context)->previous_token == END ? UNKNOWN : (__context)->previous_token ) : yychar
+
+#define stryytname(__yytokentype) ((__yytokentype) < YYNTOKENS ) ? yytname[(__yytokentype)] : ""
+
+#define parser_abort(__context, __error_message) do { (__context)->abort((__error_message), yytokentype(select_yychar(__context)), stryytname(YYTRANSLATE(select_yychar(__context)))); YYABORT; } while (0)
+
+// This is bison calling error.
+inline void __config_error(Context *context, yyscan_t *scanner, const char *error, int last_token, const char *last_token_str)
+{
+ if (not context->end())
+ {
+ context->error(error, yytokentype(last_token), last_token_str);
+ }
+ else
+ {
+ context->error(error, yytokentype(last_token), last_token_str);
+ }
+}
+
+#define config_error(__context, __scanner, __error_msg) do { __config_error((__context), (__scanner), (__error_msg), select_yychar(__context), stryytname(YYTRANSLATE(select_yychar(__context)))); } while (0)
+
+
+%}
+
+%token COMMENT
+%token END
+%token ERROR
+%token RESET
+%token PARSER_DEBUG
+%token INCLUDE
+%token CONFIGURE_FILE
+%token EMPTY_LINE
+%token SERVER
+%token SOCKET
+%token SERVERS
+%token SERVERS_OPTION
+%token UNKNOWN_OPTION
+%token UNKNOWN
+
+/* All behavior options */
+%token BINARY_PROTOCOL
+%token BUFFER_REQUESTS
+%token CONNECT_TIMEOUT
+%token DISTRIBUTION
+%token HASH
+%token HASH_WITH_NAMESPACE
+%token IO_BYTES_WATERMARK
+%token IO_KEY_PREFETCH
+%token IO_MSG_WATERMARK
+%token KETAMA_HASH
+%token KETAMA_WEIGHTED
+%token NOREPLY
+%token NUMBER_OF_REPLICAS
+%token POLL_TIMEOUT
+%token RANDOMIZE_REPLICA_READ
+%token RCV_TIMEOUT
+%token REMOVE_FAILED_SERVERS
+%token RETRY_TIMEOUT
+%token SND_TIMEOUT
+%token SOCKET_RECV_SIZE
+%token SOCKET_SEND_SIZE
+%token SORT_HOSTS
+%token SUPPORT_CAS
+%token USER_DATA
+%token USE_UDP
+%token VERIFY_KEY
+%token _TCP_KEEPALIVE
+%token _TCP_KEEPIDLE
+%token _TCP_NODELAY
+
+/* Callbacks */
+%token NAMESPACE
+
+/* Pool */
+%token POOL_MIN
+%token POOL_MAX
+
+/* Hash types */
+%token MD5
+%token CRC
+%token FNV1_64
+%token FNV1A_64
+%token FNV1_32
+%token FNV1A_32
+%token HSIEH
+%token MURMUR
+%token JENKINS
+
+/* Distributions */
+%token CONSISTENT
+%token MODULA
+%token RANDOM
+
+/* Boolean values */
+%token <boolean> TRUE
+%token <boolean> FALSE
+
+%nonassoc ','
+%nonassoc '='
+
+%token <number> FLOAT
+%token <number> NUMBER
+%token <number> PORT
+%token <number> WEIGHT_START
+%token <server> IPADDRESS
+%token <server> HOSTNAME
+%token <string> STRING
+%token <string> QUOTED_STRING
+%token <string> FILE_PATH
+
+%type <behavior> behavior_boolean
+%type <behavior> behavior_number
+%type <distribution> distribution
+%type <hash> hash
+%type <number> optional_port
+%type <number> optional_weight
+%type <string> string
+
+%%
+
+begin:
+ statement
+ | begin ' ' statement
+ ;
+
+statement:
+ expression
+ { }
+ | COMMENT
+ { }
+ | EMPTY_LINE
+ { }
+ | END
+ {
+ context->set_end();
+ YYACCEPT;
+ }
+ | ERROR
+ {
+ context->rc= MEMCACHED_PARSE_USER_ERROR;
+ parser_abort(context, "ERROR called directly");
+ }
+ | RESET
+ {
+ memcached_reset(context->memc);
+ }
+ | PARSER_DEBUG
+ {
+ yydebug= 1;
+ }
+ | INCLUDE ' ' string
+ {
+ if ((context->rc= memcached_parse_configure_file(*context->memc, $3.c_str, $3.size)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, "Failed to parse configuration file");
+ }
+ }
+ ;
+
+
+expression:
+ SERVER HOSTNAME optional_port optional_weight
+ {
+ if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, $4)))
+ {
+ char buffer[1024];
+ snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", $2.c_str, uint32_t($3));
+ parser_abort(context, buffer);
+ }
+ context->unset_server();
+ }
+ | SERVER IPADDRESS optional_port optional_weight
+ {
+ if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, $4)))
+ {
+ char buffer[1024];
+ snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", $2.c_str, uint32_t($3));
+ parser_abort(context, buffer);
+ }
+ context->unset_server();
+ }
+ | SOCKET string optional_weight
+ {
+ if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, $2.c_str, $3)))
+ {
+ char buffer[1024];
+ snprintf(buffer, sizeof(buffer), "Failed to add server: %s", $2.c_str);
+ parser_abort(context, buffer);
+ }
+ }
+ | CONFIGURE_FILE string
+ {
+ memcached_set_configuration_file(context->memc, $2.c_str, $2.size);
+ }
+ | POOL_MIN NUMBER
+ {
+ context->memc->configure.initial_pool_size= $2;
+ }
+ | POOL_MAX NUMBER
+ {
+ context->memc->configure.max_pool_size= $2;
+ }
+ | behaviors
+ ;
+
+behaviors:
+ NAMESPACE string
+ {
+ if (memcached_callback_get(context->memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL))
+ {
+ parser_abort(context, "--NAMESPACE can only be called once");
+ }
+
+ if ((context->rc= memcached_set_namespace(context->memc, $2.c_str, $2.size)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, memcached_last_error_message(context->memc));
+ }
+ }
+ | DISTRIBUTION distribution
+ {
+ // Check to see if DISTRIBUTION has already been set
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, $2)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, "--DISTRIBUTION can only be called once");
+ }
+
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, $2)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, memcached_last_error_message(context->memc));;
+ }
+ }
+ | DISTRIBUTION distribution ',' hash
+ {
+ // Check to see if DISTRIBUTION has already been set
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, $2)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, "--DISTRIBUTION can only be called once");
+ }
+
+ if ((context->rc= memcached_behavior_set_distribution_hash(context->memc, $4)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, "Unable to set the hash for the DISTRIBUTION requested");
+ }
+ }
+ | HASH hash
+ {
+ if (context->set_hash($2) == false)
+ {
+ parser_abort(context, "--HASH can only be set once");
+ }
+ }
+ | behavior_number NUMBER
+ {
+ if ((context->rc= memcached_behavior_set(context->memc, $1, $2)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, "Unable to set behavior");
+ }
+ }
+ | behavior_boolean
+ {
+ if ((context->rc= memcached_behavior_set(context->memc, $1, true)) != MEMCACHED_SUCCESS)
+ {
+ char buffer[1024];
+ snprintf(buffer, sizeof(buffer), "Could not set: %s", libmemcached_string_behavior($1));
+ parser_abort(context, buffer);
+ }
+ }
+ | USER_DATA
+ {
+ }
+ ;
+
+behavior_number:
+ REMOVE_FAILED_SERVERS
+ {
+ $$= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS;
+ }
+ | CONNECT_TIMEOUT
+ {
+ $$= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT;
+ }
+ | IO_MSG_WATERMARK
+ {
+ $$= MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK;
+ }
+ | IO_BYTES_WATERMARK
+ {
+ $$= MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK;
+ }
+ | IO_KEY_PREFETCH
+ {
+ $$= MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH;
+ }
+ | NUMBER_OF_REPLICAS
+ {
+ $$= MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS;
+ }
+ | POLL_TIMEOUT
+ {
+ $$= MEMCACHED_BEHAVIOR_POLL_TIMEOUT;
+ }
+ | RCV_TIMEOUT
+ {
+ $$= MEMCACHED_BEHAVIOR_RCV_TIMEOUT;
+ }
+ | RETRY_TIMEOUT
+ {
+ $$= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT;
+ }
+ | SND_TIMEOUT
+ {
+ $$= MEMCACHED_BEHAVIOR_SND_TIMEOUT;
+ }
+ | SOCKET_RECV_SIZE
+ {
+ $$= MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE;
+ }
+ | SOCKET_SEND_SIZE
+ {
+ $$= MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE;
+ }
+ ;
+
+behavior_boolean:
+ BINARY_PROTOCOL
+ {
+ $$= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL;
+ }
+ | BUFFER_REQUESTS
+ {
+ $$= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
+ }
+ | HASH_WITH_NAMESPACE
+ {
+ $$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
+ }
+ | NOREPLY
+ {
+ $$= MEMCACHED_BEHAVIOR_NOREPLY;
+ }
+ | RANDOMIZE_REPLICA_READ
+ {
+ $$= MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ;
+ }
+ | SORT_HOSTS
+ {
+ $$= MEMCACHED_BEHAVIOR_SORT_HOSTS;
+ }
+ | SUPPORT_CAS
+ {
+ $$= MEMCACHED_BEHAVIOR_SUPPORT_CAS;
+ }
+ | _TCP_NODELAY
+ {
+ $$= MEMCACHED_BEHAVIOR_TCP_NODELAY;
+ }
+ | _TCP_KEEPALIVE
+ {
+ $$= MEMCACHED_BEHAVIOR_TCP_KEEPALIVE;
+ }
+ | _TCP_KEEPIDLE
+ {
+ $$= MEMCACHED_BEHAVIOR_TCP_KEEPIDLE;
+ }
+ | USE_UDP
+ {
+ $$= MEMCACHED_BEHAVIOR_USE_UDP;
+ }
+ | VERIFY_KEY
+ {
+ $$= MEMCACHED_BEHAVIOR_VERIFY_KEY;
+ }
+
+
+optional_port:
+ { $$= MEMCACHED_DEFAULT_PORT;}
+ | PORT
+ { };
+ ;
+
+optional_weight:
+ { $$= 1; }
+ | WEIGHT_START
+ { }
+ ;
+
+hash:
+ MD5
+ {
+ $$= MEMCACHED_HASH_MD5;
+ }
+ | CRC
+ {
+ $$= MEMCACHED_HASH_CRC;
+ }
+ | FNV1_64
+ {
+ $$= MEMCACHED_HASH_FNV1_64;
+ }
+ | FNV1A_64
+ {
+ $$= MEMCACHED_HASH_FNV1A_64;
+ }
+ | FNV1_32
+ {
+ $$= MEMCACHED_HASH_FNV1_32;
+ }
+ | FNV1A_32
+ {
+ $$= MEMCACHED_HASH_FNV1A_32;
+ }
+ | HSIEH
+ {
+ $$= MEMCACHED_HASH_HSIEH;
+ }
+ | MURMUR
+ {
+ $$= MEMCACHED_HASH_MURMUR;
+ }
+ | JENKINS
+ {
+ $$= MEMCACHED_HASH_JENKINS;
+ }
+ ;
+
+string:
+ STRING
+ {
+ $$= $1;
+ }
+ | QUOTED_STRING
+ {
+ $$= $1;
+ }
+ ;
+
+distribution:
+ CONSISTENT
+ {
+ $$= MEMCACHED_DISTRIBUTION_CONSISTENT;
+ }
+ | MODULA
+ {
+ $$= MEMCACHED_DISTRIBUTION_MODULA;
+ }
+ | RANDOM
+ {
+ $$= MEMCACHED_DISTRIBUTION_RANDOM;
+ }
+ ;
+
+%%
+
+void Context::start()
+{
+ config_parse(this, (void **)scanner);
+}
+
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/csl/scanner.cc
^
|
| @@ -1,5 +1,5 @@
#line 2 "libmemcached/csl/scanner.cc"
-#line 22 "libmemcached/csl/scanner.l"
+#line 39 "libmemcached/csl/scanner.l"
#include <libmemcached/csl/common.h>
#include <libmemcached/csl/context.h>
@@ -1093,13 +1093,13 @@
static yyconst flex_int16_t yy_rule_linenum[65] =
{ 0,
- 81, 83, 85, 87, 89, 92, 96, 98, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 129, 130, 132, 134,
- 135, 136, 137, 138, 139, 141, 142, 145, 150, 151,
- 152, 154, 155, 156, 157, 158, 159, 160, 161, 162,
- 164, 173, 191, 198
+ 98, 100, 102, 104, 106, 109, 113, 115, 117, 118,
+ 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, 143, 144, 146, 147, 149, 151,
+ 152, 153, 154, 155, 156, 158, 159, 162, 167, 168,
+ 169, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 181, 190, 208, 215
} ;
/* The intent behind this definition is that it'll catch
@@ -1112,25 +1112,41 @@
#line 1 "libmemcached/csl/scanner.l"
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
*
- * Configure Scripting Language
+ * Libmemcached library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * Copyright (C) 2011 DataDifferental, http://datadifferential.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#line 42 "libmemcached/csl/scanner.l"
+#line 59 "libmemcached/csl/scanner.l"
#include <cstdlib>
#include <cstring>
@@ -1154,7 +1170,7 @@
#define YY_INPUT(buffer, result, max_size) get_lex_chars(buffer, result, max_size, PARAM)
-#line 1158 "libmemcached/csl/scanner.cc"
+#line 1174 "libmemcached/csl/scanner.cc"
#define INITIAL 0
@@ -1457,11 +1473,11 @@
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
/* %% [7.0] user's declarations go here */
-#line 78 "libmemcached/csl/scanner.l"
+#line 95 "libmemcached/csl/scanner.l"
-#line 1465 "libmemcached/csl/scanner.cc"
+#line 1481 "libmemcached/csl/scanner.cc"
yylval = yylval_param;
@@ -1580,28 +1596,28 @@
case 1:
YY_RULE_SETUP
-#line 81 "libmemcached/csl/scanner.l"
+#line 98 "libmemcached/csl/scanner.l"
{ return yytext[0];}
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 83 "libmemcached/csl/scanner.l"
+#line 100 "libmemcached/csl/scanner.l"
{ yylval->number= atoi(yytext); return (NUMBER); }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 85 "libmemcached/csl/scanner.l"
+#line 102 "libmemcached/csl/scanner.l"
{ yylval->number= atoi(yytext +1); return PORT; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 87 "libmemcached/csl/scanner.l"
+#line 104 "libmemcached/csl/scanner.l"
{ yylval->number= atoi(yytext +2); return WEIGHT_START; }
YY_BREAK
case 5:
/* rule 5 can match eol */
YY_RULE_SETUP
-#line 89 "libmemcached/csl/scanner.l"
+#line 106 "libmemcached/csl/scanner.l"
; /* skip whitespace */
YY_BREAK
case 6:
@@ -1609,219 +1625,219 @@
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 92 "libmemcached/csl/scanner.l"
+#line 109 "libmemcached/csl/scanner.l"
{
return COMMENT;
}
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 96 "libmemcached/csl/scanner.l"
+#line 113 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; yyextra->set_server(); return yyextra->previous_token= SERVER; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 98 "libmemcached/csl/scanner.l"
+#line 115 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SOCKET; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 100 "libmemcached/csl/scanner.l"
+#line 117 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= BINARY_PROTOCOL; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 101 "libmemcached/csl/scanner.l"
+#line 118 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= BUFFER_REQUESTS; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 102 "libmemcached/csl/scanner.l"
+#line 119 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= CONFIGURE_FILE; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 103 "libmemcached/csl/scanner.l"
+#line 120 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= CONNECT_TIMEOUT; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 104 "libmemcached/csl/scanner.l"
+#line 121 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= DISTRIBUTION; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 105 "libmemcached/csl/scanner.l"
+#line 122 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= HASH_WITH_NAMESPACE; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 106 "libmemcached/csl/scanner.l"
+#line 123 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= HASH; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 107 "libmemcached/csl/scanner.l"
+#line 124 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= IO_BYTES_WATERMARK; }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 108 "libmemcached/csl/scanner.l"
+#line 125 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= IO_KEY_PREFETCH; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 109 "libmemcached/csl/scanner.l"
+#line 126 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= IO_MSG_WATERMARK; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 110 "libmemcached/csl/scanner.l"
+#line 127 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= NOREPLY; }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 111 "libmemcached/csl/scanner.l"
+#line 128 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= NUMBER_OF_REPLICAS; }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 112 "libmemcached/csl/scanner.l"
+#line 129 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= POLL_TIMEOUT; }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 113 "libmemcached/csl/scanner.l"
+#line 130 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= RANDOMIZE_REPLICA_READ; }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 114 "libmemcached/csl/scanner.l"
+#line 131 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= RCV_TIMEOUT; }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 115 "libmemcached/csl/scanner.l"
+#line 132 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= REMOVE_FAILED_SERVERS; }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 116 "libmemcached/csl/scanner.l"
+#line 133 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= RETRY_TIMEOUT; }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 117 "libmemcached/csl/scanner.l"
+#line 134 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SND_TIMEOUT; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 118 "libmemcached/csl/scanner.l"
+#line 135 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SOCKET_RECV_SIZE; }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 119 "libmemcached/csl/scanner.l"
+#line 136 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SOCKET_SEND_SIZE; }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 120 "libmemcached/csl/scanner.l"
+#line 137 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SORT_HOSTS; }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 121 "libmemcached/csl/scanner.l"
+#line 138 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SUPPORT_CAS; }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 122 "libmemcached/csl/scanner.l"
+#line 139 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= _TCP_KEEPALIVE; }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 123 "libmemcached/csl/scanner.l"
+#line 140 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= _TCP_KEEPIDLE; }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 124 "libmemcached/csl/scanner.l"
+#line 141 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= _TCP_NODELAY; }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 125 "libmemcached/csl/scanner.l"
+#line 142 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= USE_UDP; }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 126 "libmemcached/csl/scanner.l"
+#line 143 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= USER_DATA; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 127 "libmemcached/csl/scanner.l"
+#line 144 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= VERIFY_KEY; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 129 "libmemcached/csl/scanner.l"
+#line 146 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= POOL_MIN; }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 130 "libmemcached/csl/scanner.l"
+#line 147 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= POOL_MAX; }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 132 "libmemcached/csl/scanner.l"
+#line 149 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= NAMESPACE; }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 134 "libmemcached/csl/scanner.l"
+#line 151 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= INCLUDE; }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 135 "libmemcached/csl/scanner.l"
+#line 152 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= RESET; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 136 "libmemcached/csl/scanner.l"
+#line 153 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= PARSER_DEBUG; }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 137 "libmemcached/csl/scanner.l"
+#line 154 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SERVERS; }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 138 "libmemcached/csl/scanner.l"
+#line 155 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= END; }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 139 "libmemcached/csl/scanner.l"
+#line 156 "libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= ERROR; }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 141 "libmemcached/csl/scanner.l"
+#line 158 "libmemcached/csl/scanner.l"
{ return yyextra->previous_token= TRUE; }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 142 "libmemcached/csl/scanner.l"
+#line 159 "libmemcached/csl/scanner.l"
{ return yyextra->previous_token= FALSE; }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 145 "libmemcached/csl/scanner.l"
+#line 162 "libmemcached/csl/scanner.l"
{
yyextra->begin= yytext;
return UNKNOWN_OPTION;
@@ -1829,67 +1845,67 @@
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 150 "libmemcached/csl/scanner.l"
+#line 167 "libmemcached/csl/scanner.l"
{ return CONSISTENT; }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 151 "libmemcached/csl/scanner.l"
+#line 168 "libmemcached/csl/scanner.l"
{ return MODULA; }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 152 "libmemcached/csl/scanner.l"
+#line 169 "libmemcached/csl/scanner.l"
{ return RANDOM; }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 154 "libmemcached/csl/scanner.l"
+#line 171 "libmemcached/csl/scanner.l"
{ return MD5; }
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 155 "libmemcached/csl/scanner.l"
+#line 172 "libmemcached/csl/scanner.l"
{ return CRC; }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 156 "libmemcached/csl/scanner.l"
+#line 173 "libmemcached/csl/scanner.l"
{ return FNV1_64; }
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 157 "libmemcached/csl/scanner.l"
+#line 174 "libmemcached/csl/scanner.l"
{ return FNV1A_64; }
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 158 "libmemcached/csl/scanner.l"
+#line 175 "libmemcached/csl/scanner.l"
{ return FNV1_32; }
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 159 "libmemcached/csl/scanner.l"
+#line 176 "libmemcached/csl/scanner.l"
{ return FNV1A_32; }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 160 "libmemcached/csl/scanner.l"
+#line 177 "libmemcached/csl/scanner.l"
{ return HSIEH; }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 161 "libmemcached/csl/scanner.l"
+#line 178 "libmemcached/csl/scanner.l"
{ return MURMUR; }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 162 "libmemcached/csl/scanner.l"
+#line 179 "libmemcached/csl/scanner.l"
{ return JENKINS; }
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 164 "libmemcached/csl/scanner.l"
+#line 181 "libmemcached/csl/scanner.l"
{
yylval->server.port= MEMCACHED_DEFAULT_PORT;
yylval->server.weight= 1;
@@ -1901,7 +1917,7 @@
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 173 "libmemcached/csl/scanner.l"
+#line 190 "libmemcached/csl/scanner.l"
{
if (yyextra->is_server())
{
@@ -1923,7 +1939,7 @@
case 63:
/* rule 63 can match eol */
YY_RULE_SETUP
-#line 191 "libmemcached/csl/scanner.l"
+#line 208 "libmemcached/csl/scanner.l"
{
config_get_text(yyscanner)[yyleng -1]= 0;
yylval->string.c_str= yytext +1;
@@ -1933,7 +1949,7 @@
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 198 "libmemcached/csl/scanner.l"
+#line 215 "libmemcached/csl/scanner.l"
{
yyextra->begin= yytext;
return UNKNOWN;
@@ -1941,10 +1957,10 @@
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 203 "libmemcached/csl/scanner.l"
+#line 220 "libmemcached/csl/scanner.l"
ECHO;
YY_BREAK
-#line 1948 "libmemcached/csl/scanner.cc"
+#line 1964 "libmemcached/csl/scanner.cc"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -3210,7 +3226,7 @@
/* %ok-for-header */
-#line 203 "libmemcached/csl/scanner.l"
+#line 220 "libmemcached/csl/scanner.l"
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/csl/scanner.h
^
|
| @@ -3,7 +3,7 @@
#define config_IN_HEADER 1
#line 6 "libmemcached/csl/scanner.h"
-#line 22 "libmemcached/csl/scanner.l"
+#line 39 "libmemcached/csl/scanner.l"
#include <libmemcached/csl/common.h>
#include <libmemcached/csl/context.h>
@@ -475,7 +475,7 @@
#undef YY_DECL
#endif
-#line 203 "libmemcached/csl/scanner.l"
+#line 220 "libmemcached/csl/scanner.l"
#line 482 "libmemcached/csl/scanner.h"
|
|
[-]
[+]
|
Added |
libmemcached-1.0.7.tar.bz2/libmemcached/csl/scanner.l
^
|
| @@ -0,0 +1,232 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Libmemcached library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
+ *
+ */
+
+
+%top{
+
+#include <libmemcached/csl/common.h>
+#include <libmemcached/csl/context.h>
+#include <libmemcached/csl/parser.h>
+#include <libmemcached/csl/symbol.h>
+
+#ifndef __INTEL_COMPILER
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
+#define YY_NO_INPUT
+
+#define YY_EXTRA_TYPE Context*
+
+}
+
+
+%{
+#include <cstdlib>
+#include <cstring>
+
+#define PARAM yyget_extra(yyscanner)
+
+#define get_lex_chars(buffer, result, max_size, context) \
+{ \
+ if (context->pos >= context->length) \
+ { \
+ result= YY_NULL; \
+ } \
+ else \
+ { \
+ result= (int)(context->length - context->pos); \
+ (size_t)result > (size_t)max_size ? result= max_size : 0; \
+ memcpy(buffer, context->buf + context->pos, result); \
+ context->pos += result; \
+ } \
+}
+
+
+#define YY_INPUT(buffer, result, max_size) get_lex_chars(buffer, result, max_size, PARAM)
+
+%}
+
+%option 8bit
+%option bison-bridge
+%option case-insensitive
+%option debug
+%option nounput
+%option noyywrap
+%option outfile="libmemcached/csl/scanner.cc" header-file="libmemcached/csl/scanner.h"
+%option perf-report
+%option prefix="config_"
+%option reentrant
+
+%%
+
+
+=|,|[ ] { return yytext[0];}
+
+[[:digit:]]+ { yylval->number= atoi(yytext); return (NUMBER); }
+
+:[[:digit:]]{1,5} { yylval->number= atoi(yytext +1); return PORT; }
+
+"/?"[[:digit:]]{1,5} { yylval->number= atoi(yytext +2); return WEIGHT_START; }
+
+[\t\r\n] ; /* skip whitespace */
+
+
+^#.*$ {
+ return COMMENT;
+ }
+
+"--SERVER=" { yyextra->begin= yytext; yyextra->set_server(); return yyextra->previous_token= SERVER; }
+
+"--SOCKET=" { yyextra->begin= yytext; return yyextra->previous_token= SOCKET; }
+
+"--BINARY-PROTOCOL" { yyextra->begin= yytext; return yyextra->previous_token= BINARY_PROTOCOL; }
+"--BUFFER-REQUESTS" { yyextra->begin= yytext; return yyextra->previous_token= BUFFER_REQUESTS; }
+"--CONFIGURE-FILE=" { yyextra->begin= yytext; return yyextra->previous_token= CONFIGURE_FILE; }
+"--CONNECT-TIMEOUT=" { yyextra->begin= yytext; return yyextra->previous_token= CONNECT_TIMEOUT; }
+"--DISTRIBUTION=" { yyextra->begin= yytext; return yyextra->previous_token= DISTRIBUTION; }
+"--HASH-WITH-NAMESPACE" { yyextra->begin= yytext; return yyextra->previous_token= HASH_WITH_NAMESPACE; }
+"--HASH=" { yyextra->begin= yytext; return yyextra->previous_token= HASH; }
+"--IO-BYTES-WATERMARK=" { yyextra->begin= yytext; return yyextra->previous_token= IO_BYTES_WATERMARK; }
+"--IO-KEY-PREFETCH=" { yyextra->begin= yytext; return yyextra->previous_token= IO_KEY_PREFETCH; }
+"--IO-MSG-WATERMARK=" { yyextra->begin= yytext; return yyextra->previous_token= IO_MSG_WATERMARK; }
+"--NOREPLY" { yyextra->begin= yytext; return yyextra->previous_token= NOREPLY; }
+"--NUMBER-OF-REPLICAS=" { yyextra->begin= yytext; return yyextra->previous_token= NUMBER_OF_REPLICAS; }
+"--POLL-TIMEOUT=" { yyextra->begin= yytext; return yyextra->previous_token= POLL_TIMEOUT; }
+"--RANDOMIZE-REPLICA-READ" { yyextra->begin= yytext; return yyextra->previous_token= RANDOMIZE_REPLICA_READ; }
+"--RCV-TIMEOUT=" { yyextra->begin= yytext; return yyextra->previous_token= RCV_TIMEOUT; }
+"--REMOVE-FAILED-SERVERS=" { yyextra->begin= yytext; return yyextra->previous_token= REMOVE_FAILED_SERVERS; }
+"--RETRY-TIMEOUT=" { yyextra->begin= yytext; return yyextra->previous_token= RETRY_TIMEOUT; }
+"--SND-TIMEOUT=" { yyextra->begin= yytext; return yyextra->previous_token= SND_TIMEOUT; }
+"--SOCKET-RECV-SIZE=" { yyextra->begin= yytext; return yyextra->previous_token= SOCKET_RECV_SIZE; }
+"--SOCKET-SEND-SIZE=" { yyextra->begin= yytext; return yyextra->previous_token= SOCKET_SEND_SIZE; }
+"--SORT-HOSTS" { yyextra->begin= yytext; return yyextra->previous_token= SORT_HOSTS; }
+"--SUPPORT-CAS" { yyextra->begin= yytext; return yyextra->previous_token= SUPPORT_CAS; }
+"--TCP-KEEPALIVE" { yyextra->begin= yytext; return yyextra->previous_token= _TCP_KEEPALIVE; }
+"--TCP-KEEPIDLE" { yyextra->begin= yytext; return yyextra->previous_token= _TCP_KEEPIDLE; }
+"--TCP-NODELAY" { yyextra->begin= yytext; return yyextra->previous_token= _TCP_NODELAY; }
+"--USE-UDP" { yyextra->begin= yytext; return yyextra->previous_token= USE_UDP; }
+"--USER-DATA" { yyextra->begin= yytext; return yyextra->previous_token= USER_DATA; }
+"--VERIFY-KEY" { yyextra->begin= yytext; return yyextra->previous_token= VERIFY_KEY; }
+
+"--POOL-MIN=" { yyextra->begin= yytext; return yyextra->previous_token= POOL_MIN; }
+"--POOL-MAX=" { yyextra->begin= yytext; return yyextra->previous_token= POOL_MAX; }
+
+"--NAMESPACE=" { yyextra->begin= yytext; return yyextra->previous_token= NAMESPACE; }
+
+INCLUDE { yyextra->begin= yytext; return yyextra->previous_token= INCLUDE; }
+RESET { yyextra->begin= yytext; return yyextra->previous_token= RESET; }
+DEBUG { yyextra->begin= yytext; return yyextra->previous_token= PARSER_DEBUG; }
+SERVERS { yyextra->begin= yytext; return yyextra->previous_token= SERVERS; }
+END { yyextra->begin= yytext; return yyextra->previous_token= END; }
+ERROR { yyextra->begin= yytext; return yyextra->previous_token= ERROR; }
+
+TRUE { return yyextra->previous_token= TRUE; }
+FALSE { return yyextra->previous_token= FALSE; }
+
+
+"--"[[:alnum:]]* {
+ yyextra->begin= yytext;
+ return UNKNOWN_OPTION;
+ }
+
+CONSISTENT { return CONSISTENT; }
+MODULA { return MODULA; }
+RANDOM { return RANDOM; }
+
+MD5 { return MD5; }
+CRC { return CRC; }
+FNV1_64 { return FNV1_64; }
+FNV1A_64 { return FNV1A_64; }
+FNV1_32 { return FNV1_32; }
+FNV1A_32 { return FNV1A_32; }
+HSIEH { return HSIEH; }
+MURMUR { return MURMUR; }
+JENKINS { return JENKINS; }
+
+(([[:digit:]]{1,3}"."){3}([[:digit:]]{1,3})) {
+ yylval->server.port= MEMCACHED_DEFAULT_PORT;
+ yylval->server.weight= 1;
+ yylval->server.c_str= yyextra->set_hostname(yytext, yyleng);
+ if (yylval->server.c_str)
+ yylval->server.size= yyleng;
+ return IPADDRESS;
+ }
+
+[[:alnum:]]["."[:alnum:]_-]+[[:alnum:]] {
+ if (yyextra->is_server())
+ {
+ yylval->server.port= MEMCACHED_DEFAULT_PORT;
+ yylval->server.weight= 1;
+ yylval->server.c_str= yyextra->set_hostname(yytext, yyleng);
+ if (yylval->server.c_str)
+ yylval->server.size= yyleng;
+
+ return HOSTNAME;
+ }
+
+ yylval->string.c_str = yytext;
+ yylval->string.size = yyleng;
+
+ return STRING;
+ }
+
+L?\"(\\.|[^\\"])*\" {
+ yyget_text(yyscanner)[yyleng -1]= 0;
+ yylval->string.c_str= yytext +1;
+ yylval->string.size= yyleng -2;
+ return QUOTED_STRING;
+ }
+
+. {
+ yyextra->begin= yytext;
+ return UNKNOWN;
+ }
+
+%%
+
+void Context::init_scanner()
+{
+ yylex_init(&scanner);
+ yyset_extra(this, scanner);
+}
+
+void Context::destroy_scanner()
+{
+ yylex_destroy(scanner);
+}
+
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/error.cc
^
|
| @@ -208,6 +208,7 @@
{
assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
assert_msg(rc != MEMCACHED_SOME_ERRORS, "Programmer error, MEMCACHED_SOME_ERRORS was about to be set on a memcached_server_st");
+
memcached_string_t tmp= { str, length };
return memcached_set_error(self, rc, at, tmp);
}
@@ -458,13 +459,13 @@
_error_free(error->next);
- if (error && error->root)
+ if (error and error->root)
{
libmemcached_free(error->root, error);
}
else if (error)
{
- free(error);
+ libmemcached_free(error->root, error);
}
}
@@ -524,7 +525,7 @@
return MEMCACHED_INVALID_ARGUMENTS;
}
- if (not memc->error_messages)
+ if (memc->error_messages == NULL)
{
return MEMCACHED_SUCCESS;
}
@@ -539,7 +540,7 @@
return 0;
}
- if (not memc->error_messages)
+ if (memc->error_messages == NULL)
{
return 0;
}
@@ -554,12 +555,12 @@
return NULL;
}
- if (not server->error_messages)
+ if (server->error_messages == NULL)
{
return memcached_strerror(server->root, MEMCACHED_SUCCESS);
}
- if (not server->error_messages->size)
+ if (server->error_messages->size == 0)
{
return memcached_strerror(server->root, server->error_messages->rc);
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/io.cc
^
|
| @@ -203,17 +203,19 @@
if (ptr->root->poll_timeout == 0) // Mimic 0 causes timeout behavior (not all platforms do this)
{
+ ptr->io_wait_count.timeouts++;
return memcached_set_error(*ptr, MEMCACHED_TIMEOUT, MEMCACHED_AT);
}
+ int local_errno;
size_t loop_max= 5;
while (--loop_max) // While loop is for ERESTART or EINTR
{
int active_fd= poll(&fds, 1, ptr->root->poll_timeout);
- assert_msg(active_fd <= 1 , "poll() returned an unexpected value");
- if (active_fd == 1)
+ if (active_fd >= 1)
{
+ assert_msg(active_fd == 1 , "poll() returned an unexpected value");
return MEMCACHED_SUCCESS;
}
else if (active_fd == 0)
@@ -221,48 +223,48 @@
ptr->io_wait_count.timeouts++;
return memcached_set_error(*ptr, MEMCACHED_TIMEOUT, MEMCACHED_AT);
}
- else // -1
+
+ // Only an error should result in this code being called.
+ local_errno= get_socket_errno(); // We cache in case memcached_quit_server() modifies errno
+ assert_msg(active_fd == -1 , "poll() returned an unexpected value");
+ switch (local_errno)
{
- switch (get_socket_errno())
- {
#ifdef TARGET_OS_LINUX
- case ERESTART:
+ case ERESTART:
#endif
- case EINTR:
- break;
+ case EINTR:
+ continue;
+
+ case EFAULT:
+ case ENOMEM:
+ return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
- case EFAULT:
- case ENOMEM:
- return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
-
- case EINVAL:
- return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, memcached_literal_param("RLIMIT_NOFILE exceeded, or if OSX the timeout value was invalid"));
-
- default:
- int local_errno= get_socket_errno(); // We cache in case memcached_quit_server() modifies errno
- if (fds.revents & POLLERR)
+ case EINVAL:
+ return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, memcached_literal_param("RLIMIT_NOFILE exceeded, or if OSX the timeout value was invalid"));
+
+ default:
+ if (fds.revents & POLLERR)
+ {
+ int err;
+ socklen_t len= sizeof (err);
+ if (getsockopt(ptr->fd, SOL_SOCKET, SO_ERROR, &err, &len) == 0)
{
- int err;
- socklen_t len= sizeof (err);
- if (getsockopt(ptr->fd, SOL_SOCKET, SO_ERROR, &err, &len) == 0)
+ if (err == 0) // treat this as EINTR
{
- if (err == 0) // treat this as EINTR
- {
- continue;
- }
- local_errno= err;
+ continue;
}
+ local_errno= err;
}
- memcached_quit_server(ptr, true);
-
- return memcached_set_errno(*ptr, local_errno, MEMCACHED_AT);
}
+ break;
}
+
+ break; // should only occur from poll error
}
memcached_quit_server(ptr, true);
- return memcached_set_errno(*ptr, get_socket_errno(), MEMCACHED_AT);
+ return memcached_set_errno(*ptr, local_errno, MEMCACHED_AT);
}
static bool io_flush(memcached_server_write_instance_st ptr,
@@ -302,16 +304,8 @@
WATCHPOINT_ASSERT(ptr->fd != INVALID_SOCKET);
WATCHPOINT_ASSERT(write_length > 0);
- ssize_t sent_length= 0;
- WATCHPOINT_ASSERT(ptr->fd != INVALID_SOCKET);
- if (with_flush)
- {
- sent_length= ::send(ptr->fd, local_write_ptr, write_length, MSG_NOSIGNAL|MSG_DONTWAIT);
- }
- else
- {
- sent_length= ::send(ptr->fd, local_write_ptr, write_length, MSG_NOSIGNAL|MSG_DONTWAIT|MSG_MORE);
- }
+ int flags= with_flush ? MSG_NOSIGNAL|MSG_DONTWAIT : MSG_NOSIGNAL|MSG_DONTWAIT|MSG_MORE;
+ ssize_t sent_length= ::send(ptr->fd, local_write_ptr, write_length, flags);
if (sent_length == SOCKET_ERROR)
{
@@ -347,8 +341,6 @@
}
else if (rc == MEMCACHED_TIMEOUT)
{
- ptr->io_wait_count.timeouts++;
- error= memcached_set_error(*ptr, MEMCACHED_TIMEOUT, MEMCACHED_AT);
return false;
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/memcached.cc
^
|
| @@ -124,7 +124,7 @@
return true;
}
-static void _free(memcached_st *ptr, bool release_st)
+static void __memcached_free(memcached_st *ptr, bool release_st)
{
/* If we have anything open, lets close it now */
send_quit(ptr);
@@ -174,7 +174,7 @@
}
else
{
- ptr= (memcached_st *)malloc(sizeof(memcached_st));
+ ptr= (memcached_st *)libmemcached_xmalloc(NULL, memcached_st);
if (ptr == NULL)
{
@@ -244,7 +244,7 @@
bool stored_is_allocated= memcached_is_allocated(ptr);
uint64_t query_id= ptr->query_id;
- _free(ptr, false);
+ __memcached_free(ptr, false);
memcached_create(ptr);
memcached_set_allocated(ptr, stored_is_allocated);
ptr->query_id= query_id;
@@ -283,7 +283,7 @@
{
if (ptr)
{
- _free(ptr, true);
+ __memcached_free(ptr, true);
}
}
@@ -384,11 +384,21 @@
void *memcached_get_user_data(const memcached_st *ptr)
{
+ if (ptr == NULL)
+ {
+ return NULL;
+ }
+
return ptr->user_data;
}
void *memcached_set_user_data(memcached_st *ptr, void *data)
{
+ if (ptr == NULL)
+ {
+ return NULL;
+ }
+
void *ret= ptr->user_data;
ptr->user_data= data;
@@ -402,18 +412,30 @@
memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
{
+ if (ptr == NULL)
+ {
+ return NULL;
+ }
+
return &ptr->servers[server_key];
}
memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key)
{
+ if (ptr == NULL)
+ {
+ return NULL;
+ }
+
return &ptr->servers[server_key];
}
uint64_t memcached_query_id(const memcached_st *self)
{
- if (not self)
+ if (self == NULL)
+ {
return 0;
+ }
return self->query_id;
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/memcached/protocol_binary.h
^
|
| @@ -36,7 +36,7 @@
#ifndef PROTOCOL_BINARY_H
#define PROTOCOL_BINARY_H
-#include "vbucket.h"
+#include <libmemcachedprotocol-0.0/vbucket.h>
/**
* \addtogroup Protocol
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/memcached/vbucket.h
^
|
| @@ -1,6 +1,40 @@
-/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#ifndef MEMCACHED_VBUCKET_H
-#define MEMCACHED_VBUCKET_H 1
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Libmemcached library
+ *
+ * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *
+ * 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
#ifdef __cplusplus
extern "C"
@@ -23,4 +57,3 @@
#ifdef __cplusplus
}
#endif
-#endif
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/memory.h
^
|
| @@ -36,6 +36,8 @@
#pragma once
+#include <config.h>
+
#include <libmemcached-1.0/struct/memcached.h>
#ifdef __cplusplus
@@ -54,7 +56,11 @@
}
else if (mem)
{
+#ifdef __cplusplus
+ std::free(mem);
+#else
free(mem);
+#endif
}
}
@@ -65,7 +71,11 @@
return self->allocators.malloc(self, size, self->allocators.context);
}
+#ifdef __cplusplus
+ return std::malloc(size);
+#else
return malloc(size);
+#endif
}
#define libmemcached_xmalloc(__memcachd_st, __type) ((__type *)libmemcached_malloc((__memcachd_st), sizeof(__type)))
@@ -76,7 +86,11 @@
return self->allocators.realloc(self, mem, nmemb * size, self->allocators.context);
}
- return realloc(mem, size);
+#ifdef __cplusplus
+ return std::realloc(mem, size);
+#else
+ return realloc(mem, size);
+#endif
}
#define libmemcached_xrealloc(__memcachd_st, __mem, __nelem, __type) ((__type *)libmemcached_realloc((__memcachd_st), (__mem), (__nelem), sizeof(__type)))
#define libmemcached_xvalloc(__memcachd_st, __nelem, __type) ((__type *)libmemcached_realloc((__memcachd_st), NULL, (__nelem), sizeof(__type)))
@@ -88,6 +102,10 @@
return self->allocators.calloc(self, nelem, size, self->allocators.context);
}
- return calloc(nelem, size);
+#ifdef __cplusplus
+ return std::calloc(nelem, size);
+#else
+ return calloc(nelem, size);
+#endif
}
#define libmemcached_xcalloc(__memcachd_st, __nelem, __type) ((__type *)libmemcached_calloc((__memcachd_st), (__nelem), sizeof(__type)))
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcached/response.cc
^
|
| @@ -236,9 +236,9 @@
{
/* Find the space, and then move one past it to copy version */
char *response_ptr= index(buffer, ' ');
- response_ptr++;
- long int version= strtol(response_ptr, (char **)NULL, 10);
+ char *endptr;
+ long int version= strtol(response_ptr, &endptr, 10);
if (version == LONG_MIN or version == LONG_MAX or errno == EINVAL or version > UINT8_MAX or version == 0)
{
instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
@@ -246,10 +246,8 @@
}
instance->major_version= uint8_t(version);
- response_ptr= index(response_ptr, '.');
- response_ptr++;
-
- version= strtol(response_ptr, (char **)NULL, 10);
+ endptr++;
+ version= strtol(endptr, &endptr, 10);
if (version == LONG_MIN or version == LONG_MAX or errno == EINVAL or version > UINT8_MAX)
{
instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
@@ -257,10 +255,8 @@
}
instance->minor_version= uint8_t(version);
- response_ptr= index(response_ptr, '.');
- response_ptr++;
-
- version= strtol(response_ptr, (char **)NULL, 10);
+ endptr++;
+ version= strtol(endptr, &endptr, 10);
if (version == LONG_MIN or version == LONG_MAX or errno == EINVAL or version > UINT8_MAX)
{
instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
@@ -588,6 +584,21 @@
break;
case PROTOCOL_BINARY_CMD_SASL_LIST_MECHS:
+ {
+ if (header.response.keylen != 0 || bodylen + 1 > buffer_length)
+ {
+ return MEMCACHED_UNKNOWN_READ_FAILURE;
+ }
+ else
+ {
+ if ((rc= memcached_safe_read(instance, buffer, bodylen)) != MEMCACHED_SUCCESS)
+ {
+ return MEMCACHED_UNKNOWN_READ_FAILURE;
+ }
+ }
+ }
+ break;
+
case PROTOCOL_BINARY_CMD_VERSION:
{
char version_buffer[32]; // @todo document this number
@@ -598,8 +609,8 @@
return MEMCACHED_UNKNOWN_READ_FAILURE;
}
- char *p;
- long int version= strtol(version_buffer, &p, 10);
+ char *endptr;
+ long int version= strtol(version_buffer, &endptr, 10);
if (version == LONG_MIN or version == LONG_MAX or errno == EINVAL or version > UINT8_MAX or version == 0)
{
instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
@@ -607,16 +618,18 @@
}
instance->major_version= uint8_t(version);
- version= strtol(p +1, &p, 10);
+ endptr++;
+ version= strtol(endptr, &endptr, 10);
if (version == LONG_MIN or version == LONG_MAX or errno == EINVAL or version > UINT8_MAX)
{
instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
- return memcached_set_error(*instance, MEMCACHED_UNKNOWN_READ_FAILURE, MEMCACHED_AT, memcached_literal_param("strtol() failed to parse micro version"));
+ return memcached_set_error(*instance, MEMCACHED_UNKNOWN_READ_FAILURE, MEMCACHED_AT, memcached_literal_param("strtol() failed to parse minor version"));
}
instance->minor_version= uint8_t(version);
- version= strtol(p + 1, NULL, 10);
- if (errno == ERANGE)
+ endptr++;
+ version= strtol(endptr, &endptr, 10);
+ if (version == LONG_MIN or version == LONG_MAX or errno == EINVAL or version > UINT8_MAX)
{
instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
return memcached_set_error(*instance, MEMCACHED_UNKNOWN_READ_FAILURE, MEMCACHED_AT, memcached_literal_param("strtol() failed to parse micro version"));
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcachedprotocol-0.0/binary.h
^
|
| @@ -122,6 +122,8 @@
PROTOCOL_BINARY_CMD_TOUCH = 0x1c,
PROTOCOL_BINARY_CMD_GAT = 0x1d,
PROTOCOL_BINARY_CMD_GATQ = 0x1e,
+ PROTOCOL_BINARY_CMD_GATK = 0x23,
+ PROTOCOL_BINARY_CMD_GATKQ = 0x24,
PROTOCOL_BINARY_CMD_SASL_LIST_MECHS = 0x20,
PROTOCOL_BINARY_CMD_SASL_AUTH = 0x21,
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libmemcachedprotocol/binary_handler.c
^
|
| @@ -175,6 +175,8 @@
case PROTOCOL_BINARY_CMD_TAP_CHECKPOINT_START: fprintf(stderr, "%s:%d PROTOCOL_BINARY_CMD_TAP_CHECKPOINT_START\n", __FILE__, __LINE__); return;
case PROTOCOL_BINARY_CMD_TAP_CHECKPOINT_END: fprintf(stderr, "%s:%d PROTOCOL_BINARY_CMD_TAP_CHECKPOINT_END\n", __FILE__, __LINE__); return;
case PROTOCOL_BINARY_CMD_LAST_RESERVED: fprintf(stderr, "%s:%d PROTOCOL_BINARY_CMD_LAST_RESERVED\n", __FILE__, __LINE__); return;
+ case PROTOCOL_BINARY_CMD_GATK: fprintf(stderr, "%s:%d PROTOCOL_BINARY_CMD_GATK\n", __FILE__, __LINE__); return;
+ case PROTOCOL_BINARY_CMD_GATKQ: fprintf(stderr, "%s:%d PROTOCOL_BINARY_CMD_GATKQ\n", __FILE__, __LINE__); return;
case PROTOCOL_BINARY_CMD_SCRUB: fprintf(stderr, "%s:%d PROTOCOL_BINARY_CMD_SCRUB\n", __FILE__, __LINE__); return;
default:
abort();
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/abort.cc
^
|
| @@ -1,3 +1,39 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
+ *
+ */
+
#include <cstdlib>
int main(void)
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/binaries.cc
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <config.h>
#include <libtest/common.h>
@@ -46,10 +60,22 @@
return false;
}
+bool has_drizzled_binary()
+{
+#if defined(HAVE_DRIZZLED_BINARY) && HAVE_DRIZZLED_BINARY
+ if (access(DRIZZLED_BINARY, R_OK|X_OK) == 0)
+ {
+ return true;
+ }
+#endif
+
+ return false;
+}
+
bool has_memcached_binary()
{
#if defined(HAVE_MEMCACHED_BINARY) && HAVE_MEMCACHED_BINARY
- if (access(MEMCACHED_BINARY,R_OK|X_OK) == 0)
+ if (access(MEMCACHED_BINARY, R_OK|X_OK) == 0)
{
return true;
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/binaries.h
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
@@ -32,5 +47,8 @@
LIBTEST_API
bool has_gearmand_binary();
+LIBTEST_API
+bool has_drizzled_binary();
+
} // namespace libtest
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/blobslap_worker.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/blobslap_worker.h
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/callbacks.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
#ifdef __cplusplus
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/cmdline.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * 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.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <config.h>
@@ -113,6 +128,7 @@
_use_valgrind(false),
_use_gdb(false),
_use_ptrcheck(false),
+ _will_fail(false),
_argc(0),
_exectuble(arg),
stdin_fd(STDIN_FILENO),
@@ -252,7 +268,10 @@
if (spawn_ret != 0)
{
- Error << strerror(spawn_ret) << "(" << spawn_ret << ")";
+ if (_will_fail == false)
+ {
+ Error << strerror(spawn_ret) << "(" << spawn_ret << ")";
+ }
_pid= -1;
return Application::INVALID;
}
@@ -792,4 +811,9 @@
return GEARMAND_BINARY;
}
+const char *drizzled_binary()
+{
+ return DRIZZLED_BINARY;
+}
+
} // namespace exec_cmdline
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/cmdline.h
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
@@ -134,6 +149,11 @@
return _pid;
}
+ void will_fail()
+ {
+ _will_fail= true;
+ }
+
private:
void create_argv(const char *args[]);
void delete_argv();
@@ -143,6 +163,7 @@
bool _use_valgrind;
bool _use_gdb;
bool _use_ptrcheck;
+ bool _will_fail;
size_t _argc;
std::string _exectuble_name;
std::string _exectuble;
@@ -184,5 +205,6 @@
int exec_cmdline(const std::string& executable, const char *args[], bool use_libtool= false);
const char *gearmand_binary();
+const char *drizzled_binary();
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/collection.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
/**
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/common.h
^
|
| @@ -1,24 +1,38 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
/*
Common include file for libtest
*/
@@ -58,6 +72,7 @@
#include <libtest/gearmand.h>
#include <libtest/blobslap_worker.h>
#include <libtest/memcached.h>
+#include <libtest/drizzled.h>
#include <libtest/libtool.hpp>
#include <libtest/killpid.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/comparison.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
+ *
+ * Data Differential YATL (i.e. libtest) library
*
* Copyright (C) 2012 Data Differential, http://datadifferential.com/
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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.
+ *
*/
#include <config.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/comparison.hpp
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/core.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <config.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/core.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
namespace libtest {
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/cpu.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
+ *
+ * Data Differential YATL (i.e. libtest) library
*
* Copyright (C) 2012 Data Differential, http://datadifferential.com/
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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.
+ *
*/
#include <config.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/cpu.hpp
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
+ *
+ * Data Differential YATL (i.e. libtest) library
*
* Copyright (C) 2012 Data Differential, http://datadifferential.com/
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/dream.cc
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <config.h>
#include <libtest/common.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/dream.h
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Added |
libmemcached-1.0.7.tar.bz2/libtest/drizzled.cc
^
|
| @@ -0,0 +1,220 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
+ *
+ */
+
+#include <config.h>
+#include <libtest/common.h>
+
+#include <libtest/drizzled.h>
+
+#include "util/instance.hpp"
+#include "util/operation.hpp"
+
+using namespace datadifferential;
+using namespace libtest;
+
+#include <cassert>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <signal.h>
+#include <sstream>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#ifndef __INTEL_COMPILER
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+
+#if defined(HAVE_LIBDRIZZLE) && HAVE_LIBDRIZZLE
+#include <libdrizzle-1.0/drizzle_client.h>
+#endif
+
+using namespace libtest;
+
+namespace libtest {
+bool ping_drizzled(const in_port_t _port)
+{
+#if defined(HAVE_LIBDRIZZLE) && HAVE_LIBDRIZZLE
+ {
+ drizzle_st *drizzle= drizzle_create(NULL);
+
+ if (drizzle == NULL)
+ {
+ return false;
+ }
+
+ drizzle_con_st *con;
+
+ if ((con= drizzle_con_create(drizzle, NULL)) == NULL)
+ {
+ drizzle_free(drizzle);
+ return false;
+ }
+
+ drizzle_con_set_tcp(con, "localhost", _port);
+ drizzle_con_set_auth(con, "root", 0);
+
+ bool success= false;
+
+ drizzle_return_t rc;
+ if ((rc= drizzle_con_connect(con)) == DRIZZLE_RETURN_OK)
+ {
+ drizzle_result_st *result= drizzle_ping(con, NULL, &rc);
+ success= bool(result);
+ drizzle_result_free(result);
+ }
+
+ if (success == true)
+ { }
+ else if (rc != DRIZZLE_RETURN_OK)
+ {
+ Error << drizzle_error(drizzle) << " localhost:" << _port;
+ }
+
+ drizzle_con_free(con);
+ drizzle_free(drizzle);
+
+ return success;
+ }
+#endif
+
+ return false;
+}
+} // namespace libtest
+
+class Drizzle : public libtest::Server
+{
+private:
+public:
+ Drizzle(const std::string& host_arg, in_port_t port_arg) :
+ libtest::Server(host_arg, port_arg, DRIZZLED_BINARY, false)
+ {
+ set_pid_file();
+ }
+
+ bool ping()
+ {
+ size_t limit= 5;
+ while (_app.check() and --limit)
+ {
+ if (ping_drizzled(_port))
+ {
+ return true;
+ }
+ libtest::dream(1, 0);
+ }
+
+ return false;
+ }
+
+ const char *name()
+ {
+ return "drizzled";
+ };
+
+ void log_file_option(Application& app, const std::string& arg)
+ {
+ }
+
+ bool has_log_file_option() const
+ {
+ return true;
+ }
+
+ bool broken_pid_file()
+ {
+ return true;
+ }
+
+ bool is_libtool()
+ {
+ return false;
+ }
+
+ bool has_syslog() const
+ {
+ return true;
+ }
+
+ bool has_port_option() const
+ {
+ return true;
+ }
+
+ void port_option(Application& app, in_port_t arg)
+ {
+ if (arg > 0)
+ {
+ char buffer[1024];
+ snprintf(buffer, sizeof(buffer), "--drizzle-protocol.port=%d", int(arg));
+ app.add_option(buffer);
+ }
+ }
+
+ bool build(size_t argc, const char *argv[]);
+};
+
+bool Drizzle::build(size_t argc, const char *argv[])
+{
+ if (getuid() == 0 or geteuid() == 0)
+ {
+ add_option("--user=root");
+ }
+
+ add_option("--verbose=INSPECT");
+#if 0
+ add_option("--datadir=var/drizzle");
+#endif
+
+ for (size_t x= 0 ; x < argc ; x++)
+ {
+ add_option(argv[x]);
+ }
+
+ return true;
+}
+
+namespace libtest {
+
+libtest::Server *build_drizzled(const char *hostname, in_port_t try_port)
+{
+ return new Drizzle(hostname, try_port);
+}
+
+}
|
|
[-]
[+]
|
Added |
libmemcached-1.0.7.tar.bz2/libtest/drizzled.h
^
|
| @@ -0,0 +1,50 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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
+
+#include <arpa/inet.h>
+
+namespace libtest { struct Server; }
+
+namespace libtest {
+
+libtest::Server *build_drizzled(const char *hostname, in_port_t try_port);
+
+bool ping_drizzled(const in_port_t);
+
+}
+
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/error.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
enum test_return_t {
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/failed.h
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/fatal.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
+ *
+ * Data Differential YATL (i.e. libtest) library
*
* Copyright (C) 2012 Data Differential, http://datadifferential.com/
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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.
+ *
*/
#include <config.h>
@@ -65,5 +80,19 @@
_counter++;
}
+disconnected::disconnected(const char *file, int line, const char *func, const char *instance, const in_port_t port, const char *format, ...) :
+ _port(port),
+ std::runtime_error(func)
+{
+ strncpy(_instance, instance, sizeof(_instance));
+ va_list args;
+ va_start(args, format);
+ char last_error[BUFSIZ];
+ (void)vsnprintf(last_error, sizeof(last_error), format, args);
+ va_end(args);
+
+ snprintf(_error_message, sizeof(_error_message), "%s:%d FATAL:%s (%s)", file, int(line), last_error, func);
+}
+
} // namespace libtest
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/fatal.hpp
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
+ *
+ * Data Differential YATL (i.e. libtest) library
*
* Copyright (C) 2012 Data Differential, http://datadifferential.com/
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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
@@ -52,6 +67,29 @@
char _error_message[BUFSIZ];
};
+class disconnected : std::runtime_error
+{
+public:
+ disconnected(const char *file, int line, const char *func, const char *instance, const in_port_t port, const char *format, ...);
+
+ const char* what() const throw()
+ {
+ return _error_message;
+ }
+
+ // The following are just for unittesting the exception class
+ static bool is_disabled();
+ static void disable();
+ static void enable();
+ static uint32_t disabled_counter();
+ static void increment_disabled_counter();
+
+private:
+ char _error_message[BUFSIZ];
+ in_port_t _port;
+ char _instance[1024];
+};
+
} // namespace libtest
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/framework.cc
^
|
| @@ -1,47 +1,49 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <config.h>
#include <libtest/common.h>
#include <iostream>
using namespace libtest;
-static test_return_t _default_callback(void *p)
-{
- (void)p;
-
- return TEST_SUCCESS;
-}
-
-static Runner defualt_runners;
-
Framework::Framework() :
collections(NULL),
_create(NULL),
_destroy(NULL),
- collection_startup(_default_callback),
- collection_shutdown(_default_callback),
- _on_error(NULL),
_runner(NULL),
_socket(false),
_creators_ptr(NULL)
@@ -56,73 +58,15 @@
}
_servers.shutdown();
-}
-
-test_return_t Framework::Item::pre(void *arg)
-{
- if (pre_run)
- {
- return pre_run(arg);
- }
-
- return TEST_SUCCESS;
-}
-
-test_return_t Framework::Item::post(void *arg)
-{
- if (post_run)
- {
- return post_run(arg);
- }
-
- return TEST_SUCCESS;
-}
-
-test_return_t Framework::Item::flush(void* arg, test_st* run)
-{
- if (run->requires_flush and _flush)
- {
- return _flush(arg);
- }
-
- return TEST_SUCCESS;
-}
-
-test_return_t Framework::on_error(const test_return_t rc, void* arg)
-{
- if (_on_error and test_failed(_on_error(rc, arg)))
- {
- return TEST_FAILURE;
- }
-
- return TEST_SUCCESS;
-}
-
-test_return_t Framework::startup(void* arg)
-{
- if (collection_startup)
- {
- return collection_startup(arg);
- }
-
- return TEST_SUCCESS;
-}
-
-test_return_t Framework::Item::startup(void* arg)
-{
- if (_startup)
- {
- return _startup(arg);
- }
- return TEST_SUCCESS;
+ delete _runner;
}
libtest::Runner *Framework::runner()
{
if (_runner == NULL)
{
- _runner= &defualt_runners;
+ _runner= new Runner;
}
_runner->set_servers(_servers);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/framework.h
^
|
| @@ -1,26 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
#pragma once
/**
@@ -37,96 +50,9 @@
test_callback_create_fn *_create;
test_callback_destroy_fn *_destroy;
- /* This is called a the beginning of any collection run. */
- test_callback_fn *collection_startup;
-
- /* This is called a the end of any collection run. */
- test_callback_fn *collection_shutdown;
-
- void set_collection_shutdown(test_callback_error_fn *arg)
- {
- _on_error= arg;
- }
-
public:
void* create(test_return_t& arg);
- test_return_t startup(void*);
-
- test_return_t shutdown(void* arg)
- {
- if (collection_shutdown)
- {
- return collection_shutdown(arg);
- }
-
- return TEST_SUCCESS;
- }
-
- /**
- These are run before/after the test. If implemented. Their execution is not controlled
- by the test.
- */
- class Item {
- public:
- /* This is called a the beginning of any run. */
- test_callback_fn *_startup;
-
- test_return_t startup(void*);
-
- /*
- This called on a test if the test requires a flush call (the bool is
- from test_st)
- */
- test_callback_fn *_flush;
-
- private:
- /*
- Run before and after the runnner is executed.
- */
- test_callback_fn *pre_run;
- test_callback_fn *post_run;
-
- public:
-
- Item() :
- _startup(NULL),
- _flush(NULL),
- pre_run(NULL),
- post_run(NULL)
- { }
-
- void set_startup(test_callback_fn *arg)
- {
- _startup= arg;
- }
-
- void set_collection(test_callback_fn *arg)
- {
- _flush= arg;
- }
-
- void set_flush(test_callback_fn *arg)
- {
- _flush= arg;
- }
-
- void set_pre(test_callback_fn *arg)
- {
- pre_run= arg;
- }
-
- void set_post(test_callback_fn *arg)
- {
- pre_run= arg;
- }
-
- test_return_t pre(void *arg);
- test_return_t flush(void* arg, test_st* run);
- test_return_t post(void *arg);
-
- } item;
-
/**
If an error occurs during the test, this is called.
*/
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/gearmand.cc
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <config.h>
#include <libtest/common.h>
@@ -122,7 +136,7 @@
bool has_syslog() const
{
- return true;
+ return false; // --syslog.errmsg-enable
}
bool has_port_option() const
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/gearmand.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
#include <arpa/inet.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/get.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
#ifdef __cplusplus
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/has.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
*
- * libtest
+ * Data Differential YATL (i.e. libtest) library
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <config.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/has.hpp
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
*
- * libtest
+ * Data Differential YATL (i.e. libtest) library
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/http.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <config.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/http.hpp
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
namespace libtest {
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/include.am
^
|
| @@ -1,20 +1,4 @@
# vim:ft=automake
-# Copyright (C) 2011 Data Differential, http://datadifferential.com/
-# All rights reserved.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# included from Top Level Makefile.am
# All paths should be given relative to the root
@@ -49,6 +33,7 @@
EXTRA_DIST+= libtest/run.gdb
CLEANFILES+= \
+ tmp_chroot/var/drizzle/* \
tmp_chroot/var/log/* \
tmp_chroot/var/run/* \
tmp_chroot/var/tmp/*
@@ -73,6 +58,7 @@
libtest/fatal.hpp \
libtest/framework.h \
libtest/gearmand.h \
+ libtest/drizzled.h \
libtest/get.h \
libtest/has.hpp \
libtest/http.hpp \
@@ -99,36 +85,37 @@
libtest/wait.h
noinst_LTLIBRARIES+= libtest/libtest.la
-libtest_libtest_la_SOURCES= \
- libtest/binaries.cc \
- libtest/cmdline.cc \
- libtest/comparison.cc \
- libtest/core.cc \
- libtest/cpu.cc \
- libtest/dream.cc \
- libtest/fatal.cc \
- libtest/framework.cc \
- libtest/has.cc \
- libtest/http.cc \
- libtest/is_local.cc \
- libtest/killpid.cc \
- libtest/libtool.cc \
- libtest/port.cc \
- libtest/runner.cc \
- libtest/server.cc \
- libtest/server_container.cc \
- libtest/signal.cc \
- libtest/socket.cc \
- libtest/strerror.cc \
- libtest/test.cc \
- libtest/tmpfile.cc \
- libtest/vchar.cc
libtest_libtest_la_CXXFLAGS=
libtest_libtest_la_DEPENDENCIES=
libtest_libtest_la_LIBADD=
+libtest_libtest_la_SOURCES=
+
+libtest_libtest_la_SOURCES+= libtest/binaries.cc
+libtest_libtest_la_SOURCES+= libtest/cmdline.cc
+libtest_libtest_la_SOURCES+= libtest/comparison.cc
+libtest_libtest_la_SOURCES+= libtest/core.cc
+libtest_libtest_la_SOURCES+= libtest/cpu.cc
+libtest_libtest_la_SOURCES+= libtest/dream.cc
+libtest_libtest_la_SOURCES+= libtest/fatal.cc
+libtest_libtest_la_SOURCES+= libtest/framework.cc
+libtest_libtest_la_SOURCES+= libtest/has.cc
+libtest_libtest_la_SOURCES+= libtest/drizzled.cc
+libtest_libtest_la_SOURCES+= libtest/http.cc
+libtest_libtest_la_SOURCES+= libtest/is_local.cc
+libtest_libtest_la_SOURCES+= libtest/killpid.cc
+libtest_libtest_la_SOURCES+= libtest/libtool.cc
+libtest_libtest_la_SOURCES+= libtest/main.cc
+libtest_libtest_la_SOURCES+= libtest/port.cc
+libtest_libtest_la_SOURCES+= libtest/runner.cc
+libtest_libtest_la_SOURCES+= libtest/server.cc
+libtest_libtest_la_SOURCES+= libtest/server_container.cc
+libtest_libtest_la_SOURCES+= libtest/signal.cc
+libtest_libtest_la_SOURCES+= libtest/socket.cc
+libtest_libtest_la_SOURCES+= libtest/strerror.cc
+libtest_libtest_la_SOURCES+= libtest/tmpfile.cc
+libtest_libtest_la_SOURCES+= libtest/vchar.cc
-libtest_libtest_la_CXXFLAGS+= ${NO_CONVERSION}
libtest_libtest_la_CXXFLAGS+= -DBUILDING_LIBTEST
libtest_libtest_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
libtest_libtest_la_CXXFLAGS+= -DLIBTEST_TEMP="\"tmp_chroot\""
@@ -170,6 +157,13 @@
endif
endif
+if HAVE_LIBDRIZZLE
+
+libtest_libtest_la_LIBADD+= $(libdrizzle_LIBS)
+libtest_libtest_la_CXXFLAGS+= $(libdrizzle_CFLAGS)
+
+endif
+
if BUILDING_GEARMAN
libtest_libtest_la_DEPENDENCIES+= libgearman/libgearman.la
libtest_libtest_la_LIBADD+= libgearman/libgearman.la
@@ -192,7 +186,7 @@
endif
endif
-libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run
+libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
tmp_chroot:
@$(mkdir_p) tmp_chroot
@@ -206,6 +200,9 @@
tmp_chroot/var/tmp: tmp_chroot/var
@$(mkdir_p) tmp_chroot/var/tmp
+tmp_chroot/var/drizzle: tmp_chroot/var
+ @$(mkdir_p) tmp_chroot/var/drizzle
+
tmp_chroot/var/run: tmp_chroot/var
@$(mkdir_p) tmp_chroot/var/run
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/is_local.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <config.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/is_local.hpp
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/is_pid.hpp
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/killpid.cc
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <config.h>
#include <libtest/common.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/killpid.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/libtool.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <config.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/libtool.hpp
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Added |
libmemcached-1.0.7.tar.bz2/libtest/main.cc
^
|
| @@ -0,0 +1,492 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
+ *
+ */
+
+#include <config.h>
+#include <libtest/common.h>
+
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <fnmatch.h>
+#include <iostream>
+#include <memory>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include <signal.h>
+
+#ifndef __INTEL_COMPILER
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+
+using namespace libtest;
+
+static void stats_print(Stats *stats)
+{
+ if (stats->collection_failed == 0 and stats->collection_success == 0)
+ {
+ return;
+ }
+
+ Out << "\tTotal Collections\t\t\t\t" << stats->collection_total;
+ Out << "\tFailed Collections\t\t\t\t" << stats->collection_failed;
+ Out << "\tSkipped Collections\t\t\t\t" << stats->collection_skipped;
+ Out << "\tSucceeded Collections\t\t\t\t" << stats->collection_success;
+ Outn();
+ Out << "Total\t\t\t\t" << stats->total;
+ Out << "\tFailed\t\t\t" << stats->failed;
+ Out << "\tSkipped\t\t\t" << stats->skipped;
+ Out << "\tSucceeded\t\t" << stats->success;
+}
+
+static long int timedif(struct timeval a, struct timeval b)
+{
+ long us, s;
+
+ us = (long)(a.tv_usec - b.tv_usec);
+ us /= 1000;
+ s = (long)(a.tv_sec - b.tv_sec);
+ s *= 1000;
+ return s + us;
+}
+
+static test_return_t runner_code(Framework* frame,
+ test_st* run,
+ void* creators_ptr,
+ long int& load_time)
+{ // Runner Code
+
+ struct timeval start_time, end_time;
+
+ gettimeofday(&start_time, NULL);
+ assert(frame->runner());
+ assert(run->test_fn);
+
+ test_return_t return_code;
+ try
+ {
+ return_code= frame->runner()->run(run->test_fn, creators_ptr);
+ }
+ // Special case where check for the testing of the exception
+ // system.
+ catch (libtest::fatal &e)
+ {
+ if (fatal::is_disabled())
+ {
+ fatal::increment_disabled_counter();
+ return_code= TEST_SUCCESS;
+ }
+ else
+ {
+ throw;
+ }
+ }
+
+ gettimeofday(&end_time, NULL);
+ load_time= timedif(end_time, start_time);
+
+ return return_code;
+}
+
+#include <getopt.h>
+#include <unistd.h>
+
+int main(int argc, char *argv[])
+{
+ bool opt_massive= false;
+ unsigned long int opt_repeat= 1; // Run all tests once
+ bool opt_quiet= false;
+ std::string collection_to_run;
+
+ // Options parsing
+ {
+ enum long_option_t {
+ OPT_LIBYATL_VERSION,
+ OPT_LIBYATL_MATCH_COLLECTION,
+ OPT_LIBYATL_MASSIVE,
+ OPT_LIBYATL_QUIET,
+ OPT_LIBYATL_REPEAT
+ };
+
+ static struct option long_options[]=
+ {
+ { "version", no_argument, NULL, OPT_LIBYATL_VERSION },
+ { "quiet", no_argument, NULL, OPT_LIBYATL_QUIET },
+ { "repeat", no_argument, NULL, OPT_LIBYATL_REPEAT },
+ { "collection", required_argument, NULL, OPT_LIBYATL_MATCH_COLLECTION },
+ { "massive", no_argument, NULL, OPT_LIBYATL_MASSIVE },
+ { 0, 0, 0, 0 }
+ };
+
+ int option_index= 0;
+ while (1)
+ {
+ int option_rv= getopt_long(argc, argv, "", long_options, &option_index);
+ if (option_rv == -1)
+ {
+ break;
+ }
+
+ switch (option_rv)
+ {
+ case OPT_LIBYATL_VERSION:
+ break;
+
+ case OPT_LIBYATL_QUIET:
+ opt_quiet= true;
+ break;
+
+ case OPT_LIBYATL_REPEAT:
+ opt_repeat= strtoul(optarg, (char **) NULL, 10);
+ break;
+
+ case OPT_LIBYATL_MATCH_COLLECTION:
+ collection_to_run= optarg;
+ break;
+
+ case OPT_LIBYATL_MASSIVE:
+ opt_massive= true;
+ break;
+
+ case '?':
+ /* getopt_long already printed an error message. */
+ Error << "unknown option to getopt_long()";
+ exit(EXIT_FAILURE);
+
+ default:
+ break;
+ }
+ }
+ }
+
+ srandom((unsigned int)time(NULL));
+
+ if (bool(getenv("YATL_REPEAT")) and (strtoul(getenv("YATL_REPEAT"), (char **) NULL, 10) > 1))
+ {
+ opt_repeat= strtoul(getenv("YATL_REPEAT"), (char **) NULL, 10);
+ }
+
+ if ((bool(getenv("YATL_QUIET")) and (strcmp(getenv("YATL_QUIET"), "0") == 0)) or opt_quiet)
+ {
+ opt_quiet= true;
+ }
+ else if (getenv("JENKINS_URL"))
+ {
+ if (bool(getenv("YATL_QUIET")) and (strcmp(getenv("YATL_QUIET"), "1") == 0))
+ { }
+ else
+ {
+ opt_quiet= true;
+ }
+ }
+
+ if (opt_quiet)
+ {
+ close(STDOUT_FILENO);
+ }
+
+ char buffer[1024];
+ if (getenv("LIBTEST_TMP"))
+ {
+ snprintf(buffer, sizeof(buffer), "%s", getenv("LIBTEST_TMP"));
+ }
+ else
+ {
+ snprintf(buffer, sizeof(buffer), "%s", LIBTEST_TEMP);
+ }
+
+ if (chdir(buffer) == -1)
+ {
+ char getcwd_buffer[1024];
+ char *dir= getcwd(getcwd_buffer, sizeof(getcwd_buffer));
+
+ Error << "Unable to chdir() from " << dir << " to " << buffer << " errno:" << strerror(errno);
+ return EXIT_FAILURE;
+ }
+
+ if (libtest::libtool() == NULL)
+ {
+ Error << "Failed to locate libtool";
+ return EXIT_FAILURE;
+ }
+
+ int exit_code;
+
+ try
+ {
+ do
+ {
+ exit_code= EXIT_SUCCESS;
+ std::auto_ptr<Framework> frame(new Framework);
+
+ fatal_assert(sigignore(SIGPIPE) == 0);
+
+ libtest::SignalThread signal;
+ if (signal.setup() == false)
+ {
+ Error << "Failed to setup signals";
+ return EXIT_FAILURE;
+ }
+
+ Stats stats;
+
+ get_world(frame.get());
+
+ test_return_t error;
+ void *creators_ptr= frame->create(error);
+
+ switch (error)
+ {
+ case TEST_SUCCESS:
+ break;
+
+ case TEST_SKIPPED:
+ Out << "SKIP " << argv[0];
+ return EXIT_SUCCESS;
+
+ case TEST_FAILURE:
+ return EXIT_FAILURE;
+ }
+
+ if (getenv("YATL_COLLECTION_TO_RUN"))
+ {
+ if (strlen(getenv("YATL_COLLECTION_TO_RUN")))
+ {
+ collection_to_run= getenv("YATL_COLLECTION_TO_RUN");
+ }
+ }
+
+ if (collection_to_run.compare("none") == 0)
+ {
+ return EXIT_SUCCESS;
+ }
+
+ if (collection_to_run.empty() == false)
+ {
+ Out << "Only testing " << collection_to_run;
+ }
+
+ char *wildcard= NULL;
+ if (argc == 3)
+ {
+ wildcard= argv[2];
+ }
+
+ for (collection_st *next= frame->collections; next and next->name and (not signal.is_shutdown()); next++)
+ {
+ if (collection_to_run.empty() == false and fnmatch(collection_to_run.c_str(), next->name, 0))
+ {
+ continue;
+ }
+
+ stats.collection_total++;
+
+ bool failed= false;
+ bool skipped= false;
+ test_return_t collection_rc;
+ if (test_success(collection_rc= frame->runner()->pre(next->pre, creators_ptr)))
+ {
+ Out << "Collection: " << next->name;
+
+ for (test_st *run= next->tests; run->name; run++)
+ {
+ long int load_time= 0;
+
+ if (wildcard && fnmatch(wildcard, run->name, 0))
+ {
+ continue;
+ }
+
+ test_return_t return_code;
+ try
+ {
+ if (run->requires_flush)
+ {
+ if (test_failed(frame->runner()->flush(creators_ptr)))
+ {
+ Error << "frame->runner()->flush(creators_ptr)";
+ continue;
+ }
+ }
+
+ return_code= runner_code(frame.get(), run, creators_ptr, load_time);
+
+ if (return_code == TEST_SKIPPED)
+ { }
+ else if (return_code == TEST_FAILURE)
+ {
+#if 0
+ Error << " frame->runner()->run(failure)";
+ signal.set_shutdown(SHUTDOWN_GRACEFUL);
+#endif
+ }
+
+ }
+ catch (libtest::fatal &e)
+ {
+ Error << "Fatal exception was thrown: " << e.what();
+ return_code= TEST_FAILURE;
+ throw;
+ }
+ catch (std::exception &e)
+ {
+ Error << "Exception was thrown: " << e.what();
+ return_code= TEST_FAILURE;
+ throw;
+ }
+ catch (...)
+ {
+ Error << "Unknown exception occurred";
+ return_code= TEST_FAILURE;
+ throw;
+ }
+
+ stats.total++;
+
+ switch (return_code)
+ {
+ case TEST_SUCCESS:
+ Out << "\tTesting " << run->name << "\t\t\t\t\t" << load_time / 1000 << "." << load_time % 1000 << "[ " << test_strerror(return_code) << " ]";
+ stats.success++;
+ break;
+
+ case TEST_FAILURE:
+ stats.failed++;
+ failed= true;
+ Out << "\tTesting " << run->name << "\t\t\t\t\t" << "[ " << test_strerror(return_code) << " ]";
+ break;
+
+ case TEST_SKIPPED:
+ stats.skipped++;
+ skipped= true;
+ Out << "\tTesting " << run->name << "\t\t\t\t\t" << "[ " << test_strerror(return_code) << " ]";
+ break;
+
+ default:
+ fatal_message("invalid return code");
+ }
+#if 0
+ @TODO add code here to allow for a collection to define a method to reset to allow tests to continue.
+#endif
+ }
+
+ (void) frame->runner()->post(next->post, creators_ptr);
+ }
+ else if (collection_rc == TEST_FAILURE)
+ {
+ Out << next->name << " [ failed ]";
+ failed= true;
+#if 0
+ signal.set_shutdown(SHUTDOWN_GRACEFUL);
+#endif
+ }
+ else if (collection_rc == TEST_SKIPPED)
+ {
+ Out << next->name << " [ skipping ]";
+ skipped= true;
+ }
+
+ if (failed == false and skipped == false)
+ {
+ stats.collection_success++;
+ }
+
+ if (failed)
+ {
+ stats.collection_failed++;
+ }
+
+ if (skipped)
+ {
+ stats.collection_skipped++;
+ }
+
+ Outn();
+ }
+
+ if (signal.is_shutdown() == false)
+ {
+ signal.set_shutdown(SHUTDOWN_GRACEFUL);
+ }
+
+ shutdown_t status= signal.get_shutdown();
+ if (status == SHUTDOWN_FORCED)
+ {
+ Out << "Tests were aborted.";
+ exit_code= EXIT_FAILURE;
+ }
+ else if (stats.collection_failed)
+ {
+ Out << "Some test failed.";
+ exit_code= EXIT_FAILURE;
+ }
+ else if (stats.collection_skipped and stats.collection_failed and stats.collection_success)
+ {
+ Out << "Some tests were skipped.";
+ }
+ else if (stats.collection_success and (stats.collection_failed == 0))
+ {
+ Out << "All tests completed successfully.";
+ }
+
+ stats_print(&stats);
+
+ Outn(); // Generate a blank to break up the messages if make check/test has been run
+ } while (exit_code == EXIT_SUCCESS and --opt_repeat);
+ }
+ catch (libtest::fatal& e)
+ {
+ std::cerr << e.what() << std::endl;
+ }
+ catch (libtest::disconnected& e)
+ {
+ std::cerr << "Unhandled disconnection occurred:" << e.what() << std::endl;
+ }
+ catch (std::exception& e)
+ {
+ std::cerr << e.what() << std::endl;
+ }
+ catch (...)
+ {
+ std::cerr << "Unknown exception halted execution." << std::endl;
+ }
+
+ return exit_code;
+}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/memcached.cc
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <config.h>
#include <libtest/common.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/memcached.h
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/port.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <config.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/port.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
/*
Structures for generic tests.
*/
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/runner.cc
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <config.h>
#include <libtest/common.h>
@@ -29,6 +43,11 @@
{
}
+test_return_t Runner::flush(void*)
+{
+ return TEST_SUCCESS;
+}
+
test_return_t Runner::run(test_callback_fn* func, void *object)
{
if (func)
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/runner.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
@@ -31,6 +45,7 @@
*/
class Runner {
public:
+ virtual test_return_t flush(void*);
virtual test_return_t run(test_callback_fn* func, void *object);
virtual test_return_t pre(test_callback_fn* func, void *object);
virtual test_return_t post(test_callback_fn* func, void *object);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/server.cc
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * 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.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <config.h>
#include <libtest/common.h>
@@ -201,6 +215,7 @@
{
if (_app.check())
{
+ _app.slurp();
continue;
}
@@ -254,14 +269,18 @@
}
throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
- "Failed to ping(), waited: %u server started, having pid_file. exec: %s stderr:%s",
+ "Failed native ping(), pid: %d is alive: %s waited: %u server started, having pid_file. exec: %s stderr:%s",
+ int(_app.pid()),
+ _app.check() ? "true" : "false",
this_wait, _running.c_str(),
_app.stderr_c_str());
}
else
{
throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
- "Failed to ping(), waited: %u server started. exec: %s stderr:%s",
+ "Failed native ping(), pid: %d is alive: %s waited: %u server started. exec: %s stderr:%s",
+ int(_app.pid()),
+ _app.check() ? "true" : "false",
this_wait,
_running.c_str(),
_app.stderr_c_str());
@@ -371,7 +390,7 @@
{
// Set a log file if it was requested (and we can)
- if (false and has_log_file_option())
+ if (has_log_file_option())
{
set_log_file();
log_file_option(app, _log_file);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/server.h
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/server_container.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <config.h>
@@ -179,6 +194,16 @@
}
}
}
+ else if (server_type.compare("drizzled") == 0)
+ {
+ if (DRIZZLED_BINARY)
+ {
+ if (HAVE_LIBDRIZZLE)
+ {
+ server= build_drizzled("localhost", try_port);
+ }
+ }
+ }
else if (server_type.compare("blobslap_worker") == 0)
{
if (GEARMAND_BINARY)
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/server_container.h
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/signal.cc
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <config.h>
#include <libtest/common.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/signal.h
^
|
| @@ -1,26 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
#pragma once
#include <pthread.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/skiptest.cc
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <config.h>
#include <libtest/test.hpp>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/socket.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <config.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/socket.hpp
^
|
| @@ -1,22 +1,38 @@
+
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/stats.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
struct Stats {
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/stream.h
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/strerror.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <config.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/strerror.h
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/string.hpp
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
#include "util/string.hpp"
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/test.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
#ifndef __INTEL_COMPILER
@@ -96,6 +110,15 @@
{ \
return TEST_SKIPPED; \
} \
+} while (0)
+
+#define test_skip_hint(__expected, __actual, __hint) \
+do \
+{ \
+ if (libtest::_compare_hint(__FILE__, __LINE__, __func__, (__expected), (__actual), (__hint)) == false) \
+ { \
+ return TEST_SKIPPED; \
+ } \
} while (0)
#define test_skip_valgrind() \
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/test.hpp
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
/*
Structures for generic tests.
*/
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/tmpfile.cc
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
+ *
+ * Data Differential YATL (i.e. libtest) library
*
* Copyright (C) 2012 Data Differential, http://datadifferential.com/
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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.
+ *
*/
-
#include <libtest/common.h>
namespace libtest {
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/tmpfile.hpp
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
+ *
+ * Data Differential YATL (i.e. libtest) library
*
* Copyright (C) 2012 Data Differential, http://datadifferential.com/
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/unittest.cc
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * 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.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include <config.h>
#include <libtest/test.hpp>
@@ -154,6 +168,12 @@
return TEST_SUCCESS;
}
+static test_return_t var_drizzle_exists_test(void *)
+{
+ test_compare(0, access("var/drizzle", R_OK | W_OK | X_OK));
+ return TEST_SUCCESS;
+}
+
static test_return_t var_tmp_test(void *)
{
FILE *file= fopen("var/tmp/junk", "w+");
@@ -180,6 +200,14 @@
return TEST_SUCCESS;
}
+static test_return_t var_drizzle_test(void *)
+{
+ FILE *file= fopen("var/drizzle/junk", "w+");
+ test_true(file);
+ fclose(file);
+ return TEST_SUCCESS;
+}
+
static test_return_t var_tmp_rm_test(void *)
{
test_true(unlink("var/tmp/junk") == 0);
@@ -198,6 +226,12 @@
return TEST_SUCCESS;
}
+static test_return_t var_drizzle_rm_test(void *)
+{
+ test_true(unlink("var/drizzle/junk") == 0);
+ return TEST_SUCCESS;
+}
+
static test_return_t _compare_test_return_t_test(void *)
{
test_compare(TEST_SUCCESS, TEST_SUCCESS);
@@ -225,6 +259,22 @@
return TEST_SUCCESS;
}
+static test_return_t drizzled_cycle_test(void *object)
+{
+ server_startup_st *servers= (server_startup_st*)object;
+ test_true(servers and servers->validate());
+
+#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
+ test_true(has_drizzled_binary());
+#endif
+
+ test_skip(true, has_drizzled_binary());
+
+ test_true(server_startup(*servers, "drizzled", get_free_port(), 0, NULL));
+
+ return TEST_SUCCESS;
+}
+
static test_return_t gearmand_cycle_test(void *object)
{
server_startup_st *servers= (server_startup_st*)object;
@@ -384,6 +434,7 @@
test_skip_valgrind();
Application true_app("doesnotexist");
+ true_app.will_fail();
const char *args[]= { "--fubar", 0 };
#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
@@ -710,6 +761,18 @@
return TEST_SUCCESS;
}
+static test_return_t check_for_drizzle(void *)
+{
+ test_skip(true, HAVE_LIBDRIZZLE);
+ test_skip(true, has_drizzled_binary());
+ return TEST_SUCCESS;
+}
+
+
+test_st drizzled_tests[] ={
+ {"drizzled startup-shutdown", 0, drizzled_cycle_test },
+ {0, 0, 0}
+};
test_st gearmand_tests[] ={
#if 0
@@ -768,12 +831,15 @@
{"var/tmp exists", 0, var_tmp_exists_test },
{"var/run exists", 0, var_run_exists_test },
{"var/log exists", 0, var_log_exists_test },
+ {"var/drizzle exists", 0, var_drizzle_exists_test },
{"var/tmp", 0, var_tmp_test },
{"var/run", 0, var_run_test },
{"var/log", 0, var_log_test },
+ {"var/drizzle", 0, var_drizzle_test },
{"var/tmp rm", 0, var_tmp_rm_test },
{"var/run rm", 0, var_run_rm_test },
{"var/log rm", 0, var_log_rm_test },
+ {"var/drizzle rm", 0, var_drizzle_rm_test },
{0, 0, 0}
};
@@ -868,6 +934,7 @@
{"comparison", 0, 0, comparison_tests},
{"gearmand", check_for_gearman, 0, gearmand_tests},
{"memcached", check_for_libmemcached, 0, memcached_tests},
+ {"drizzled", check_for_drizzle, 0, drizzled_tests},
{"cmdline", 0, 0, cmdline_tests},
{"application", 0, 0, application_tests},
{"http", check_for_curl, 0, http_tests},
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/vchar.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <config.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/vchar.hpp
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
#include <cstring>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/version.h.in
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
#define LIBTEST_VERSION_STRING "@VERSION@"
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/visibility.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
#if defined(BUILDING_LIBTEST)
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/wait.cc
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <config.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/libtest/wait.h
^
|
| @@ -1,25 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#pragma once
#include <unistd.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/m4/bottom.m4
^
|
| @@ -24,19 +24,11 @@
# define HAVE_ULONG 1
typedef unsigned long int ulong;
#endif
+
+#define RPACKAGE "memcached"
+#define RVERSION "1.4.13"
-#if defined(RMEMCACHED_PACKAGE)
-#undef VERSION
-#define VERSION VERSION_NUMBER
-#endif
-
-#if defined(RMEMCACHED_PACKAGE)
-#undef PACKAGE
-#define PACKAGE RMEMCACHED_PACKAGE
-#endif
-
-
])
])dnl CONFIG_EXTRA
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/memcached/include.am
^
|
| @@ -12,9 +12,9 @@
noinst_HEADERS+= memcached/trace.h
noinst_HEADERS+= memcached/util.h
-memcached_memcached_SOURCES=
memcached_memcached_CFLAGS=
memcached_memcached_LDADD=
+memcached_memcached_SOURCES=
memcached_memcached_SOURCES+=
memcached_memcached_SOURCES+= memcached/assoc.c
@@ -29,10 +29,8 @@
memcached_memcached_SOURCES+= memcached/trace.h
memcached_memcached_SOURCES+= memcached/util.c
-memcached_memcached_CFLAGS+= -DHAVE_CONFIG_H -std=c99
memcached_memcached_CFLAGS+= ${PTHREAD_CFLAGS}
-memcached_memcached_CFLAGS+= -DRMEMCACHED_VERSION="\"1.4.13\""
-memcached_memcached_CFLAGS+= -DRMEMCACHED_PACKAGE="\"memcached\""
+memcached_memcached_CFLAGS+= -DHAVE_CONFIG_H -std=c99
memcached_memcached_LDADD+= $(LIBEVENT_LDFLAGS)
memcached_memcached_LDADD+= ${PTHREAD_LIBS}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/memcached/memcached.c
^
|
| @@ -1887,7 +1887,7 @@
switch (c->cmd) {
case PROTOCOL_BINARY_CMD_VERSION:
if (extlen == 0 && keylen == 0 && bodylen == 0) {
- write_bin_response(c, VERSION, 0, 0, strlen(VERSION));
+ write_bin_response(c, RVERSION, 0, 0, strlen(RVERSION));
} else {
protocol_error = 1;
}
@@ -2568,7 +2568,7 @@
APPEND_STAT("pid", "%lu", (long)pid);
APPEND_STAT("uptime", "%u", now);
APPEND_STAT("time", "%ld", now + (long)process_started);
- APPEND_STAT("version", "%s", VERSION);
+ APPEND_STAT("version", "%s", RVERSION);
APPEND_STAT("libevent", "%s", event_get_version());
APPEND_STAT("pointer_size", "%d", (int)(8 * sizeof(void *)));
@@ -3363,7 +3363,7 @@
} else if (ntokens == 2 && (strcmp(tokens[COMMAND_TOKEN].value, "version") == 0)) {
- out_string(c, "VERSION " VERSION);
+ out_string(c, "VERSION " RVERSION);
} else if (ntokens == 2 && (strcmp(tokens[COMMAND_TOKEN].value, "quit") == 0)) {
@@ -4242,7 +4242,12 @@
}
#endif
- setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags));
+ error = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
+ if (error != 0)
+ {
+ perror("setsockopt(SO_REUSEADDR)");
+ }
+
if (IS_UDP(transport)) {
maximize_sndbuf(sfd);
} else {
@@ -4499,7 +4504,7 @@
}
static void usage(void) {
- printf(PACKAGE " " VERSION "\n");
+ printf(RPACKAGE " " RVERSION "\n");
printf("-p <num> TCP port number to listen on (default: 11211)\n"
"-U <num> UDP port number to listen on (default: 11211, 0 is off)\n"
"-s <file> UNIX socket path to listen on (disables network support)\n"
@@ -4564,7 +4569,7 @@
}
static void usage_license(void) {
- printf(PACKAGE " " VERSION "\n\n");
+ printf(RPACKAGE " " RVERSION "\n\n");
printf(
"Copyright (c) 2003, Danga Interactive, Inc. <http://www.danga.com/>\n"
"All rights reserved.\n"
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/support/libmemcached.spec
^
|
| @@ -1,6 +1,6 @@
Name: libmemcached
Summary: memcached C library and command line tools
-Version: 1.0.6
+Version: 1.0.7
Release: 1
License: BSD
Group: System Environment/Libraries
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/failure.cc
^
|
| @@ -218,16 +218,7 @@
world->_create= (test_callback_create_fn*)world_create;
world->_destroy= (test_callback_destroy_fn*)world_destroy;
- world->item._startup= (test_callback_fn*)world_test_startup;
- world->item.set_pre((test_callback_fn*)world_pre_run);
- world->item.set_flush((test_callback_fn*)world_flush);
- world->item.set_post((test_callback_fn*)world_post_run);
- world->_on_error= (test_callback_error_fn*)world_on_error;
-
- world->collection_startup= (test_callback_fn*)world_container_startup;
- world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
-
- world->set_runner(&defualt_libmemcached_runner);
+ world->set_runner(new LibmemcachedRunner);
global_framework= world;
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/include.am
^
|
| @@ -18,13 +18,15 @@
PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
EXTRA_DIST+= tests/cpp_example.cc
-EXTRA_DIST+= tests/output_plus.res
noinst_HEADERS+= tests/exist.h
-noinst_HEADERS+= tests/keys.hpp
noinst_HEADERS+= tests/hash_results.h
+noinst_HEADERS+= tests/keys.hpp
+noinst_HEADERS+= tests/libmemcached_test_container.h
noinst_HEADERS+= tests/libmemcached_world.h
noinst_HEADERS+= tests/libmemcached_world_socket.h
+noinst_HEADERS+= tests/memc.h
+noinst_HEADERS+= tests/runner.h
# Cycle should always run first
tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
@@ -39,7 +41,15 @@
include tests/libmemcached-1.0/include.am
-tests_failure_SOURCES= tests/failure.cc
+tests_failure_SOURCES=
+tests_failure_SOURCES+= tests/failure.cc
+tests_failure_SOURCES+= clients/execute.cc
+tests_failure_SOURCES+= clients/generator.cc
+tests_failure_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_failure_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_failure_SOURCES+= tests/libmemcached-1.0/generate.cc
+tests_failure_SOURCES+= tests/libmemcached-1.0/print.cc
+
tests_failure_CXXFLAGS = $(AM_CXXFLAGS)
tests_failure_DEPENDENCIES= $(TESTS_LDADDS)
tests_failure_LDADD= $(tests_failure_DEPENDENCIES)
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/all_tests.cc
^
|
| @@ -87,16 +87,7 @@
world->_create= (test_callback_create_fn*)world_create;
world->_destroy= (test_callback_destroy_fn*)world_destroy;
- world->item._startup= (test_callback_fn*)world_test_startup;
- world->item.set_pre((test_callback_fn*)world_pre_run);
- world->item.set_flush((test_callback_fn*)world_flush);
- world->item.set_post((test_callback_fn*)world_post_run);
- world->_on_error= (test_callback_error_fn*)world_on_error;
-
- world->collection_startup= (test_callback_fn*)world_container_startup;
- world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
-
- world->set_runner(&defualt_libmemcached_runner);
+ world->set_runner(new LibmemcachedRunner);
world->set_socket();
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/all_tests.h
^
|
| @@ -238,6 +238,7 @@
};
test_st replication_tests[]= {
+ {"validate replication setup", true, (test_callback_fn*)check_replication_sanity_TEST },
{"set", true, (test_callback_fn*)replication_set_test },
{"get", false, (test_callback_fn*)replication_get_test },
{"mget", false, (test_callback_fn*)replication_mget_test },
@@ -282,12 +283,14 @@
};
test_st generate_tests[] ={
- {"generate_pairs", true, (test_callback_fn*)generate_pairs },
{"generate_data", true, (test_callback_fn*)generate_data },
{"get_read", false, (test_callback_fn*)get_read },
{"delete_generate", false, (test_callback_fn*)delete_generate },
- {"generate_buffer_data", true, (test_callback_fn*)generate_buffer_data },
- {"delete_buffer", false, (test_callback_fn*)delete_buffer_generate},
+ {"cleanup", true, (test_callback_fn*)cleanup_pairs },
+ {0, 0, (test_callback_fn*)0}
+};
+ // New start
+test_st generate_mget_TESTS[] ={
{"generate_data", true, (test_callback_fn*)generate_data },
{"mget_read", false, (test_callback_fn*)mget_read },
{"mget_read_result", false, (test_callback_fn*)mget_read_result },
@@ -295,15 +298,16 @@
{"memcached_fetch_result() partial read", false, (test_callback_fn*)mget_read_partial_result },
{"mget_read_function", false, (test_callback_fn*)mget_read_function },
{"cleanup", true, (test_callback_fn*)cleanup_pairs },
+ {0, 0, (test_callback_fn*)0}
+};
+
+test_st generate_large_TESTS[] ={
{"generate_large_pairs", true, (test_callback_fn*)generate_large_pairs },
- {"generate_data", true, (test_callback_fn*)generate_data },
- {"generate_buffer_data", true, (test_callback_fn*)generate_buffer_data },
{"cleanup", true, (test_callback_fn*)cleanup_pairs },
{0, 0, (test_callback_fn*)0}
};
test_st consistent_tests[] ={
- {"generate_pairs", true, (test_callback_fn*)generate_pairs },
{"generate_data", true, (test_callback_fn*)generate_data },
{"get_read", 0, (test_callback_fn*)get_read_count },
{"cleanup", true, (test_callback_fn*)cleanup_pairs },
@@ -311,7 +315,6 @@
};
test_st consistent_weighted_tests[] ={
- {"generate_pairs", true, (test_callback_fn*)generate_pairs },
{"generate_data", true, (test_callback_fn*)generate_data_with_stats },
{"get_read", false, (test_callback_fn*)get_read_count },
{"cleanup", true, (test_callback_fn*)cleanup_pairs },
@@ -468,6 +471,9 @@
{"Cal Haldenbrand's tests", 0, 0, haldenbrand_TESTS},
{"user written tests", 0, 0, user_tests},
{"generate", 0, 0, generate_tests},
+ {"generate MEMCACHED_BEHAVIOR_BUFFER_REQUESTS", (test_callback_fn*)pre_buffer, 0, generate_tests},
+ {"mget generate MEMCACHED_BEHAVIOR_BUFFER_REQUESTS", (test_callback_fn*)pre_buffer, 0, generate_mget_TESTS},
+ {"generate large", 0, 0, generate_large_TESTS},
{"generate_hsieh", (test_callback_fn*)pre_hsieh, 0, generate_tests},
{"generate_ketama", (test_callback_fn*)pre_behavior_ketama, 0, generate_tests},
{"generate_hsieh_consistent", (test_callback_fn*)enable_consistent_hsieh, 0, generate_tests},
@@ -475,9 +481,7 @@
{"generate_murmur", (test_callback_fn*)pre_murmur, 0, generate_tests},
{"generate_jenkins", (test_callback_fn*)pre_jenkins, 0, generate_tests},
{"generate_nonblock", (test_callback_fn*)pre_nonblock, 0, generate_tests},
- // Too slow
- {"generate_corked", (test_callback_fn*)pre_cork, 0, generate_tests},
- {"generate_corked_and_nonblock", (test_callback_fn*)pre_cork_and_nonblock, 0, generate_tests},
+ {"mget generate_nonblock", (test_callback_fn*)pre_nonblock, 0, generate_mget_TESTS},
{"consistent_not", 0, 0, consistent_tests},
{"consistent_ketama", (test_callback_fn*)pre_behavior_ketama, 0, consistent_tests},
{"consistent_ketama_weighted", (test_callback_fn*)pre_behavior_ketama_weighted, 0, consistent_weighted_tests},
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/all_tests_socket.cc
^
|
| @@ -76,14 +76,5 @@
world->_create= (test_callback_create_fn*)world_create;
world->_destroy= (test_callback_destroy_fn*)world_destroy;
- world->item._startup= (test_callback_fn*)world_test_startup;
- world->item.set_pre((test_callback_fn*)world_pre_run);
- world->item.set_flush((test_callback_fn*)world_flush);
- world->item.set_post((test_callback_fn*)world_post_run);
- world->_on_error= (test_callback_error_fn*)world_on_error;
-
- world->collection_startup= (test_callback_fn*)world_container_startup;
- world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
-
- world->set_runner(&defualt_libmemcached_runner);
+ world->set_runner(new LibmemcachedRunner);
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/atomsmasher.cc
^
|
| @@ -34,6 +34,8 @@
#include <tests/debug.h>
+#include "tests/libmemcached-1.0/generate.h"
+
using namespace libtest;
/* Number of items generated for tests */
@@ -46,14 +48,14 @@
static char *global_keys[GLOBAL_COUNT];
static size_t global_keys_length[GLOBAL_COUNT];
-static test_return_t cleanup_pairs(memcached_st *)
+static test_return_t cleanup_pairs_TEST(memcached_st *)
{
pairs_free(global_pairs);
return TEST_SUCCESS;
}
-static test_return_t generate_pairs(memcached_st *)
+static test_return_t generate_pairs_TEST(memcached_st *)
{
global_pairs= pairs_generate(GLOBAL_COUNT, 400);
@@ -66,26 +68,22 @@
return TEST_SUCCESS;
}
-static test_return_t drizzle(memcached_st *memc)
+static test_return_t drizzle_TEST(memcached_st *memc)
{
infinite:
for (ptrdiff_t x= 0; x < TEST_COUNTER; x++)
{
memcached_return_t rc;
- char *return_value;
- size_t return_value_length;
- uint32_t flags;
-
- uint32_t test_bit;
- uint8_t which;
- test_bit= (uint32_t)(random() % GLOBAL_COUNT);
- which= (uint8_t)(random() % 2);
+ uint32_t test_bit= (uint32_t)(random() % GLOBAL_COUNT);
+ uint8_t which= (uint8_t)(random() % 2);
if (which == 0)
{
- return_value= memcached_get(memc, global_keys[test_bit], global_keys_length[test_bit],
- &return_value_length, &flags, &rc);
+ size_t return_value_length;
+ uint32_t flags;
+ char* return_value= memcached_get(memc, global_keys[test_bit], global_keys_length[test_bit],
+ &return_value_length, &flags, &rc);
if (rc == MEMCACHED_SUCCESS && return_value)
{
free(return_value);
@@ -123,7 +121,7 @@
static test_return_t pre_nonblock(memcached_st *memc)
{
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
+ test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0));
return TEST_SUCCESS;
}
@@ -137,10 +135,9 @@
const char *key= "foo";
const char *value= "when we sanitize";
- memcached_return_t rc;
- rc= memcached_set(memc, key, strlen(key),
- value, strlen(value),
- (time_t)0, (uint32_t)0);
+ memcached_return_t rc= memcached_set(memc, key, strlen(key),
+ value, strlen(value),
+ time_t(0), uint32_t(0));
test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_strerror(NULL, rc));
memcached_quit(memc);
rc= memcached_add(memc, key, strlen(key),
@@ -180,9 +177,9 @@
}
test_st smash_tests[] ={
- {"generate_pairs", true, (test_callback_fn*)generate_pairs },
- {"drizzle", true, (test_callback_fn*)drizzle },
- {"cleanup", true, (test_callback_fn*)cleanup_pairs },
+ {"generate_pairs", true, (test_callback_fn*)generate_pairs_TEST },
+ {"drizzle", true, (test_callback_fn*)drizzle_TEST },
+ {"cleanup", true, (test_callback_fn*)cleanup_pairs_TEST },
{"many_adds", true, (test_callback_fn*)many_adds },
{0, 0, 0}
};
@@ -203,8 +200,7 @@
for (ptrdiff_t x= 0; x < BENCHMARK_TEST_LOOP; x++)
{
- memcached_st *ptr;
- ptr= memcached_create(&benchmark_state.create[x]);
+ memcached_st *ptr= memcached_create(&benchmark_state.create[x]);
test_true(ptr);
}
@@ -284,14 +280,5 @@
world->_create= (test_callback_create_fn*)world_create;
world->_destroy= (test_callback_destroy_fn*)world_destroy;
- world->item._startup= (test_callback_fn*)world_test_startup;
- world->item._flush= (test_callback_fn*)world_flush;
- world->item.set_pre((test_callback_fn*)world_pre_run);
- world->item.set_post((test_callback_fn*)world_post_run);
- world->_on_error= (test_callback_error_fn*)world_on_error;
-
- world->collection_startup= (test_callback_fn*)world_container_startup;
- world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
-
- world->set_runner(&defualt_libmemcached_runner);
+ world->set_runner(new LibmemcachedRunner);
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/generate.cc
^
|
| @@ -38,7 +38,7 @@
#include <config.h>
#include <libtest/test.hpp>
-#include <libmemcached/util.h>
+#include <libmemcachedutil-1.0/util.h>
#include <libmemcached/is.h>
#include <tests/libmemcached-1.0/generate.h>
@@ -53,20 +53,20 @@
using namespace libtest;
-static pairs_st *global_pairs;
+static pairs_st *global_pairs= NULL;
static const char *global_keys[GLOBAL_COUNT];
static size_t global_keys_length[GLOBAL_COUNT];
static size_t global_count= 0;
-test_return_t cleanup_pairs(memcached_st *memc)
+test_return_t cleanup_pairs(memcached_st*)
{
- (void)memc;
pairs_free(global_pairs);
+ global_pairs= NULL;
return TEST_SUCCESS;
}
-test_return_t generate_pairs(memcached_st *)
+static test_return_t generate_pairs(memcached_st *)
{
global_pairs= pairs_generate(GLOBAL_COUNT, 400);
global_count= GLOBAL_COUNT;
@@ -80,7 +80,7 @@
return TEST_SUCCESS;
}
-test_return_t generate_large_pairs(memcached_st *)
+test_return_t generate_large_pairs(memcached_st *memc)
{
global_pairs= pairs_generate(GLOBAL2_COUNT, MEMCACHED_MAX_BUFFER+10);
global_count= GLOBAL2_COUNT;
@@ -91,20 +91,30 @@
global_keys_length[x]= global_pairs[x].key_length;
}
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, true);
+ unsigned int check_execute= execute_set(memc, global_pairs, global_count);
+
+ test_true(check_execute > (global_count / 2));
+
return TEST_SUCCESS;
}
test_return_t generate_data(memcached_st *memc)
{
+ test_compare(TEST_SUCCESS, generate_pairs(memc));
+
unsigned int check_execute= execute_set(memc, global_pairs, global_count);
- test_compare_warn_hint(global_count, check_execute, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+ test_true_hint(check_execute > (global_count / 2),
+ "Possible false, positive, memcached may have ejected key/value based on memory needs");
return TEST_SUCCESS;
}
test_return_t generate_data_with_stats(memcached_st *memc)
{
+ test_compare(TEST_SUCCESS, generate_pairs(memc));
+
unsigned int check_execute= execute_set(memc, global_pairs, global_count);
test_compare(check_execute, global_count);
@@ -194,7 +204,8 @@
free(return_value);
}
}
- test_compare_warn_hint(global_count, keys_returned, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+ test_true_hint(keys_returned > (global_count / 2),
+ "Possible false, positive, memcached may have ejected key/value based on memory needs");
return TEST_SUCCESS;
}
@@ -211,8 +222,7 @@
{
unsigned int keys_returned;
test_compare(TEST_SUCCESS, fetch_all_results(memc, keys_returned));
- test_true(keys_returned > 0);
- test_compare_warn_hint(global_count, keys_returned, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+ test_true(keys_returned > (global_count / 2));
}
return TEST_SUCCESS;
@@ -320,7 +330,8 @@
total++;
}
}
- test_compare_warn_hint(global_count, total, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+ test_true_hint(total > (global_count / 2),
+ "Possible false, positive, memcached may have ejected key/value based on memory needs");
return TEST_SUCCESS;
}
@@ -337,7 +348,9 @@
total++;
}
}
- test_compare_warn_hint(global_count, total, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+
+ test_true_hint(total > (global_count / 2),
+ "Possible false, positive, memcached may have ejected key/value based on memory needs");
return TEST_SUCCESS;
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/generate.h
^
|
| @@ -44,7 +44,6 @@
test_return_t generate_data(memcached_st*);
test_return_t generate_data_with_stats(memcached_st*);
test_return_t generate_large_pairs(memcached_st *);
-test_return_t generate_pairs(memcached_st*);
test_return_t get_read(memcached_st*);
test_return_t get_read_count(memcached_st*);
test_return_t mget_read(memcached_st*);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/include.am
^
|
| @@ -8,43 +8,50 @@
# included from Top Level Makefile.am
# All paths should be given relative to the root
-noinst_HEADERS+= \
- tests/basic.h \
- tests/callbacks.h \
- tests/debug.h \
- tests/deprecated.h \
- tests/error_conditions.h \
- tests/exist.h \
- tests/ketama.h \
- tests/ketama_test_cases.h \
- tests/ketama_test_cases_spy.h \
- tests/libmemcached-1.0/all_tests.h \
- tests/libmemcached-1.0/callback_counter.h \
- tests/libmemcached-1.0/dump.h \
- tests/libmemcached-1.0/fetch_all_results.h \
- tests/libmemcached-1.0/generate.h \
- tests/libmemcached-1.0/encoding_key.h \
- tests/libmemcached-1.0/haldenbrand.h \
- tests/libmemcached-1.0/mem_functions.h \
- tests/libmemcached-1.0/memcached_get.h \
- tests/libmemcached-1.0/setup_and_teardowns.h \
- tests/libmemcached-1.0/stat.h \
- tests/namespace.h \
- tests/parser.h \
- tests/pool.h \
- tests/print.h \
- tests/replication.h \
- tests/server_add.h \
- tests/string.h \
- tests/touch.h \
- tests/virtual_buckets.h
+noinst_HEADERS+= tests/basic.h
+noinst_HEADERS+= tests/callbacks.h
+noinst_HEADERS+= tests/debug.h
+noinst_HEADERS+= tests/deprecated.h
+noinst_HEADERS+= tests/error_conditions.h
+noinst_HEADERS+= tests/exist.h
+noinst_HEADERS+= tests/ketama.h
+noinst_HEADERS+= tests/ketama_test_cases.h
+noinst_HEADERS+= tests/ketama_test_cases_spy.h
+noinst_HEADERS+= tests/libmemcached-1.0/all_tests.h
+noinst_HEADERS+= tests/libmemcached-1.0/callback_counter.h
+noinst_HEADERS+= tests/libmemcached-1.0/dump.h
+noinst_HEADERS+= tests/libmemcached-1.0/fetch_all_results.h
+noinst_HEADERS+= tests/libmemcached-1.0/generate.h
+noinst_HEADERS+= tests/libmemcached-1.0/encoding_key.h
+noinst_HEADERS+= tests/libmemcached-1.0/haldenbrand.h
+noinst_HEADERS+= tests/libmemcached-1.0/mem_functions.h
+noinst_HEADERS+= tests/libmemcached-1.0/memcached_get.h
+noinst_HEADERS+= tests/libmemcached-1.0/setup_and_teardowns.h
+noinst_HEADERS+= tests/libmemcached-1.0/stat.h
+noinst_HEADERS+= tests/namespace.h
+noinst_HEADERS+= tests/parser.h
+noinst_HEADERS+= tests/pool.h
+noinst_HEADERS+= tests/print.h
+noinst_HEADERS+= tests/replication.h
+noinst_HEADERS+= tests/server_add.h
+noinst_HEADERS+= tests/string.h
+noinst_HEADERS+= tests/touch.h
+noinst_HEADERS+= tests/virtual_buckets.h
# Test internals
-tests_libmemcached_1_0_internals_SOURCES= tests/libmemcached-1.0/internals.cc
+tests_libmemcached_1_0_internals_CXXFLAGS=
+tests_libmemcached_1_0_internals_DEPENDENCIES=
+tests_libmemcached_1_0_internals_LDADD=
+tests_libmemcached_1_0_internals_SOURCES=
+
+tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/internals.cc
tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/string.cc
-tests_libmemcached_1_0_internals_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
-tests_libmemcached_1_0_internals_DEPENDENCIES= libmemcachedinternal/libmemcachedinternal.la libtest/libtest.la libmemcachedinternal/libmemcachedutilinternal.la
-tests_libmemcached_1_0_internals_LDADD= libmemcachedinternal/libmemcachedinternal.la
+tests_libmemcached_1_0_internals_CXXFLAGS+= $(AM_CXXFLAGS)
+tests_libmemcached_1_0_internals_CXXFLAGS+= ${PTHREAD_CFLAGS}
+tests_libmemcached_1_0_internals_DEPENDENCIES+= libmemcachedinternal/libmemcachedinternal.la
+tests_libmemcached_1_0_internals_DEPENDENCIES+= libtest/libtest.la
+tests_libmemcached_1_0_internals_DEPENDENCIES+= libmemcachedinternal/libmemcachedutilinternal.la
+tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedinternal.la
tests_libmemcached_1_0_internals_LDADD+= ${PTHREAD_LIBS}
tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la
tests_libmemcached_1_0_internals_LDADD+= libtest/libtest.la
@@ -52,154 +59,208 @@
noinst_PROGRAMS+= tests/libmemcached-1.0/internals
-tests_libmemcached_1_0_testapp_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
-tests_libmemcached_1_0_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+tests_libmemcached_1_0_testapp_CXXFLAGS=
+tests_libmemcached_1_0_testapp_CFLAGS=
tests_libmemcached_1_0_testapp_SOURCES=
-tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/all_tests.cc
-tests_libmemcached_1_0_testapp_SOURCES+= \
- tests/libmemcached-1.0/basic.cc \
- tests/libmemcached-1.0/callback_counter.cc \
- tests/libmemcached-1.0/callbacks.cc \
- tests/libmemcached-1.0/debug.cc \
- tests/libmemcached-1.0/deprecated.cc \
- tests/libmemcached-1.0/dump.cc \
- tests/libmemcached-1.0/encoding_key.cc \
- tests/libmemcached-1.0/error_conditions.cc \
- tests/libmemcached-1.0/exist.cc \
- tests/libmemcached-1.0/fetch_all_results.cc \
- tests/libmemcached-1.0/generate.cc \
- tests/libmemcached-1.0/haldenbrand.cc \
- tests/libmemcached-1.0/ketama.cc \
- tests/libmemcached-1.0/mem_functions.cc \
- tests/libmemcached-1.0/memcached_get.cc \
- tests/libmemcached-1.0/namespace.cc \
- tests/libmemcached-1.0/parser.cc \
- tests/libmemcached-1.0/pool.cc \
- tests/libmemcached-1.0/print.cc \
- tests/libmemcached-1.0/replication.cc \
- tests/libmemcached-1.0/server_add.cc \
- tests/libmemcached-1.0/setup_and_teardowns.cc \
- tests/libmemcached-1.0/stat.cc \
- tests/libmemcached-1.0/touch.cc \
- tests/libmemcached-1.0/virtual_buckets.cc
+tests_libmemcached_1_0_testapp_DEPENDENCIES=
+tests_libmemcached_1_0_testapp_LDADD=
+tests_libmemcached_1_0_testapp_CXXFLAGS+= $(AM_CXXFLAGS)
+tests_libmemcached_1_0_testapp_CXXFLAGS+= ${PTHREAD_CFLAGS}
+tests_libmemcached_1_0_testapp_CFLAGS+= $(AM_CFLAGS)
+tests_libmemcached_1_0_testapp_CFLAGS+= $(NO_CONVERSION)
+tests_libmemcached_1_0_testapp_CFLAGS+= $(NO_STRICT_ALIASING)
tests_libmemcached_1_0_testapp_SOURCES+= clients/generator.cc clients/execute.cc
-tests_libmemcached_1_0_testapp_DEPENDENCIES= \
- libmemcached/libmemcached.la \
- libtest/libtest.la \
- libhashkit/libhashkit.la \
- libmemcached/libmemcachedutil.la
-
-tests_libmemcached_1_0_testapp_LDADD= \
- $(LIBUUID_LDFLAGS) \
- ${PTHREAD_LIBS} \
- libmemcached/libmemcached.la \
- libmemcached/libmemcachedutil.la \
- libtest/libtest.la \
- libhashkit/libhashkit.la
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/all_tests.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/basic.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/callbacks.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/debug.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/deprecated.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/dump.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/encoding_key.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/error_conditions.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/exist.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/generate.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/haldenbrand.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/ketama.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/mem_functions.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/memcached_get.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/namespace.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/parser.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/pool.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/print.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/replication.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/server_add.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/setup_and_teardowns.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/stat.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/touch.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/virtual_buckets.cc
+tests_libmemcached_1_0_testapp_DEPENDENCIES+= libmemcached/libmemcached.la
+tests_libmemcached_1_0_testapp_DEPENDENCIES+= libtest/libtest.la
+tests_libmemcached_1_0_testapp_DEPENDENCIES+= libhashkit/libhashkit.la
+tests_libmemcached_1_0_testapp_DEPENDENCIES+= libmemcached/libmemcachedutil.la
+
+tests_libmemcached_1_0_testapp_LDADD+= $(LIBUUID_LDFLAGS)
+tests_libmemcached_1_0_testapp_LDADD+= ${PTHREAD_LIBS}
+tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcached.la
+tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcachedutil.la
+tests_libmemcached_1_0_testapp_LDADD+= libtest/libtest.la
+tests_libmemcached_1_0_testapp_LDADD+= libhashkit/libhashkit.la
check_PROGRAMS+= tests/libmemcached-1.0/testapp
noinst_PROGRAMS+= tests/libmemcached-1.0/testapp
-tests_libmemcached_1_0_testsocket_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
-tests_libmemcached_1_0_testsocket_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
-tests_libmemcached_1_0_testsocket_SOURCES= \
- tests/libmemcached-1.0/all_tests_socket.cc \
- tests/libmemcached-1.0/basic.cc \
- tests/libmemcached-1.0/callback_counter.cc \
- tests/libmemcached-1.0/callbacks.cc \
- tests/libmemcached-1.0/debug.cc \
- tests/libmemcached-1.0/deprecated.cc \
- tests/libmemcached-1.0/dump.cc \
- tests/libmemcached-1.0/encoding_key.cc \
- tests/libmemcached-1.0/error_conditions.cc \
- tests/libmemcached-1.0/exist.cc \
- tests/libmemcached-1.0/fetch_all_results.cc \
- tests/libmemcached-1.0/generate.cc \
- tests/libmemcached-1.0/haldenbrand.cc \
- tests/libmemcached-1.0/ketama.cc \
- tests/libmemcached-1.0/mem_functions.cc \
- tests/libmemcached-1.0/memcached_get.cc \
- tests/libmemcached-1.0/namespace.cc \
- tests/libmemcached-1.0/parser.cc \
- tests/libmemcached-1.0/pool.cc \
- tests/libmemcached-1.0/print.cc \
- tests/libmemcached-1.0/replication.cc \
- tests/libmemcached-1.0/server_add.cc \
- tests/libmemcached-1.0/setup_and_teardowns.cc \
- tests/libmemcached-1.0/stat.cc \
- tests/libmemcached-1.0/touch.cc \
- tests/libmemcached-1.0/virtual_buckets.cc
-
-tests_libmemcached_1_0_testsocket_SOURCES+= clients/generator.cc clients/execute.cc
-tests_libmemcached_1_0_testsocket_DEPENDENCIES= \
- libmemcached/libmemcached.la \
- libtest/libtest.la \
- libhashkit/libhashkit.la \
- libmemcached/libmemcachedutil.la
-
-tests_libmemcached_1_0_testsocket_LDADD= \
- $(LIBUUID_LDFLAGS) \
- ${PTHREAD_LIBS} \
- libmemcached/libmemcached.la \
- libmemcached/libmemcachedutil.la \
- libtest/libtest.la \
- libhashkit/libhashkit.la
+tests_libmemcached_1_0_testsocket_CXXFLAGS=
+tests_libmemcached_1_0_testsocket_CFLAGS=
+tests_libmemcached_1_0_testsocket_SOURCES=
+tests_libmemcached_1_0_testsocket_DEPENDENCIES=
+tests_libmemcached_1_0_testsocket_LDADD=
+
+tests_libmemcached_1_0_testsocket_CXXFLAGS+= ${PTHREAD_CFLAGS}
+tests_libmemcached_1_0_testsocket_CXXFLAGS+= $(AM_CXXFLAGS)
+tests_libmemcached_1_0_testsocket_CFLAGS+= $(AM_CFLAGS)
+tests_libmemcached_1_0_testsocket_CFLAGS+= $(NO_CONVERSION)
+tests_libmemcached_1_0_testsocket_CFLAGS+= $(NO_STRICT_ALIASING)
+
+tests_libmemcached_1_0_testsocket_SOURCES+= clients/execute.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= clients/generator.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/all_tests_socket.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/basic.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/callbacks.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/debug.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/deprecated.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/dump.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/encoding_key.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/error_conditions.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/exist.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/generate.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/haldenbrand.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/ketama.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/mem_functions.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/memcached_get.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/namespace.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/parser.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/pool.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/print.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/replication.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/server_add.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/setup_and_teardowns.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/stat.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/touch.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/virtual_buckets.cc
+
+tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libmemcached/libmemcached.la
+tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libtest/libtest.la
+tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libhashkit/libhashkit.la
+tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libmemcached/libmemcachedutil.la
+
+tests_libmemcached_1_0_testsocket_LDADD+= $(LIBUUID_LDFLAGS)
+tests_libmemcached_1_0_testsocket_LDADD+= ${PTHREAD_LIBS}
+tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcached.la
+tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcachedutil.la
+tests_libmemcached_1_0_testsocket_LDADD+= libtest/libtest.la
+tests_libmemcached_1_0_testsocket_LDADD+= libhashkit/libhashkit.la
check_PROGRAMS+= tests/libmemcached-1.0/testsocket
noinst_PROGRAMS+= tests/libmemcached-1.0/testsocket
-tests_libmemcached_1_0_sasl_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
-tests_libmemcached_1_0_sasl_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
-tests_libmemcached_1_0_sasl_SOURCES= \
- tests/libmemcached-1.0/basic.cc \
- tests/libmemcached-1.0/debug.cc \
- tests/libmemcached-1.0/deprecated.cc \
- tests/libmemcached-1.0/error_conditions.cc \
- tests/libmemcached-1.0/ketama.cc \
- tests/libmemcached-1.0/namespace.cc \
- tests/libmemcached-1.0/parser.cc \
- tests/libmemcached-1.0/pool.cc \
- tests/libmemcached-1.0/print.cc \
- tests/libmemcached-1.0/replication.cc \
- tests/libmemcached-1.0/sasl.cc \
- tests/libmemcached-1.0/virtual_buckets.cc
-tests_libmemcached_1_0_sasl_SOURCES+= clients/generator.cc clients/execute.cc
-tests_libmemcached_1_0_sasl_DEPENDENCIES= \
- libmemcached/libmemcached.la \
- libtest/libtest.la
-tests_libmemcached_1_0_sasl_LDADD= \
- ${PTHREAD_LIBS} \
- libmemcached/libmemcached.la \
- libmemcached/libmemcachedutil.la \
- libtest/libtest.la \
- libhashkit/libhashkit.la
+tests_libmemcached_1_0_sasl_SOURCES=
+tests_libmemcached_1_0_sasl_DEPENDENCIES=
+tests_libmemcached_1_0_sasl_LDADD=
+tests_libmemcached_1_0_sasl_CXXFLAGS=
+tests_libmemcached_1_0_sasl_CFLAGS=
+
+tests_libmemcached_1_0_sasl_CXXFLAGS+= $(AM_CXXFLAGS)
+tests_libmemcached_1_0_sasl_CXXFLAGS+= ${PTHREAD_CFLAGS}
+tests_libmemcached_1_0_sasl_CFLAGS+= $(AM_CFLAGS)
+tests_libmemcached_1_0_sasl_CFLAGS+= $(NO_CONVERSION)
+tests_libmemcached_1_0_sasl_CFLAGS+= $(NO_STRICT_ALIASING)
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/basic.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/debug.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/deprecated.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/error_conditions.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/ketama.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/namespace.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/parser.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/pool.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/print.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/replication.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/sasl.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/virtual_buckets.cc
+tests_libmemcached_1_0_sasl_SOURCES+= clients/execute.cc
+tests_libmemcached_1_0_sasl_SOURCES+= clients/generator.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/generate.cc
+
+tests_libmemcached_1_0_sasl_DEPENDENCIES+= libmemcached/libmemcached.la
+tests_libmemcached_1_0_sasl_DEPENDENCIES+= libtest/libtest.la
+
+tests_libmemcached_1_0_sasl_LDADD+= ${PTHREAD_LIBS}
+tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcached.la
+tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcachedutil.la
+tests_libmemcached_1_0_sasl_LDADD+= libtest/libtest.la
+tests_libmemcached_1_0_sasl_LDADD+= libhashkit/libhashkit.la
+
check_PROGRAMS+= tests/libmemcached-1.0/sasl
noinst_PROGRAMS+= tests/libmemcached-1.0/sasl
-tests_atomsmasher_SOURCES= \
- tests/libmemcached-1.0/atomsmasher.cc \
- tests/libmemcached-1.0/debug.cc \
- tests/libmemcached-1.0/print.cc \
- clients/generator.cc \
- clients/execute.cc
-tests_atomsmasher_DEPENDENCIES= $(TESTS_LDADDS)
-tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES)
+tests_atomsmasher_SOURCES=
+tests_atomsmasher_DEPENDENCIES=
+tests_atomsmasher_LDADD=
+
+tests_atomsmasher_DEPENDENCIES+= $(TESTS_LDADDS)
+tests_atomsmasher_LDADD+= $(tests_atomsmasher_DEPENDENCIES)
+tests_atomsmasher_SOURCES+= clients/execute.cc
+tests_atomsmasher_SOURCES+= clients/generator.cc
+tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/atomsmasher.cc
+tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/debug.cc
+tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/generate.cc
+tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/print.cc
noinst_PROGRAMS+= tests/atomsmasher
-tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
-tests_testudp_SOURCES= tests/mem_udp.cc
-tests_testudp_DEPENDENCIES= $(TESTS_LDADDS)
-tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES)
+tests_testudp_CFLAGS=
+tests_testudp_SOURCES=
+tests_testudp_DEPENDENCIES=
+tests_testudp_LDADD=
+
+tests_testudp_CFLAGS+= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+tests_testudp_SOURCES+= clients/execute.cc
+tests_testudp_SOURCES+= clients/generator.cc
+tests_testudp_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_testudp_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_testudp_SOURCES+= tests/libmemcached-1.0/generate.cc
+tests_testudp_SOURCES+= tests/libmemcached-1.0/print.cc
+tests_testudp_SOURCES+= tests/mem_udp.cc
+tests_testudp_DEPENDENCIES+= $(TESTS_LDADDS)
+tests_testudp_LDADD+= $(tests_testudp_DEPENDENCIES)
check_PROGRAMS+= tests/testudp
noinst_PROGRAMS+= tests/testudp
test-udp: tests/testudp
@tests/testudp
-tests_testplus_SOURCES= tests/libmemcached-1.0/plus.cpp
-tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_testplus_DEPENDENCIES= $(TESTS_LDADDS)
-tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES)
+tests_testplus_SOURCES=
+tests_testplus_CXXFLAGS=
+tests_testplus_DEPENDENCIES=
+tests_testplus_LDADD=
+
+tests_testplus_SOURCES+= clients/execute.cc
+tests_testplus_SOURCES+= clients/generator.cc
+tests_testplus_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_testplus_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_testplus_SOURCES+= tests/libmemcached-1.0/generate.cc
+tests_testplus_SOURCES+= tests/libmemcached-1.0/plus.cpp
+tests_testplus_SOURCES+= tests/libmemcached-1.0/print.cc
+
+tests_testplus_CXXFLAGS+= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_testplus_DEPENDENCIES+= $(TESTS_LDADDS)
+tests_testplus_LDADD+= $(tests_testplus_DEPENDENCIES)
check_PROGRAMS+= tests/testplus
noinst_PROGRAMS+= tests/testplus
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/mem_functions.cc
^
|
| @@ -646,7 +646,12 @@
memcached_return_t rc;
char *out_value= memcached_get(memc, keys.key_at(which_key), keys.length_at(which_key),
&value_length, &flags, &rc);
- test_compare(MEMCACHED_SUCCESS, rc);
+ if (rc == MEMCACHED_NOTFOUND)
+ { } // It is possible that the value has been purged.
+ else
+ {
+ test_compare_hint(MEMCACHED_SUCCESS, rc, memcached_last_error_message(memc));
+ }
test_null(out_value);
test_zero(value_length);
test_zero(flags);
@@ -1694,7 +1699,7 @@
}
#define REGRESSION_BINARY_VS_BLOCK_COUNT 20480
-static pairs_st *global_pairs;
+static pairs_st *global_pairs= NULL;
test_return_t key_setup(memcached_st *memc)
{
@@ -1708,6 +1713,7 @@
test_return_t key_teardown(memcached_st *)
{
pairs_free(global_pairs);
+ global_pairs= NULL;
return TEST_SUCCESS;
}
@@ -1717,9 +1723,14 @@
/* First add all of the items.. */
for (ptrdiff_t x= 0; x < REGRESSION_BINARY_VS_BLOCK_COUNT; ++x)
{
- char blob[1024] = {0};
+ libtest::vchar_t blob;
+ libtest::vchar::make(blob, 1024);
- memcached_return_t rc= memcached_add_by_key(memc, "bob", 3, global_pairs[x].key, global_pairs[x].key_length, blob, sizeof(blob), 0, 0);
+ memcached_return_t rc= memcached_add_by_key(memc,
+ test_literal_param("bob"),
+ global_pairs[x].key, global_pairs[x].key_length,
+ &blob[0], blob.size(),
+ time_t(0), uint32_t(0));
test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE, memcached_strerror(NULL, rc));
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/plus.cpp
^
|
| @@ -291,14 +291,5 @@
world->_create= world_create;
world->_destroy= world_destroy;
- world->item._startup= reinterpret_cast<test_callback_fn*>(world_test_startup);
- world->item._flush= reinterpret_cast<test_callback_fn*>(world_flush);
- world->item.set_pre(reinterpret_cast<test_callback_fn*>(world_pre_run));
- world->item.set_post(reinterpret_cast<test_callback_fn*>(world_post_run));
- world->_on_error= reinterpret_cast<test_callback_error_fn*>(world_on_error);
-
- world->collection_startup= reinterpret_cast<test_callback_fn*>(world_container_startup);
- world->collection_shutdown= reinterpret_cast<test_callback_fn*>(world_container_shutdown);
-
- world->set_runner(&defualt_libmemcached_runner);
+ world->set_runner(new LibmemcachedRunner);
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/print.cc
^
|
| @@ -47,12 +47,10 @@
#include "tests/print.h"
-memcached_return_t server_print_callback(const memcached_st *ptr,
+memcached_return_t server_print_callback(const memcached_st*,
const memcached_server_st *server,
void *context)
{
- (void)ptr;
-
if (context)
{
std::cerr << memcached_server_name(server) << ":" << memcached_server_port(server) << std::endl;
@@ -60,3 +58,26 @@
return MEMCACHED_SUCCESS;
}
+
+const char * print_version(memcached_st *memc)
+{
+ memcached_server_fn callbacks[1];
+ callbacks[0]= server_print_version_callback;
+ memcached_server_cursor(memc, callbacks, NULL, 1);
+
+ return "print_version()";
+}
+
+
+memcached_return_t server_print_version_callback(const memcached_st *,
+ const memcached_server_st *server,
+ void *)
+{
+ std::cerr << "Server: " << memcached_server_name(server) << ":" << memcached_server_port(server) << " "
+ << int(server->major_version) << "."
+ << int(server->minor_version) << "."
+ << int(server->micro_version)
+ << std::endl;
+
+ return MEMCACHED_SUCCESS;
+}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/replication.cc
^
|
| @@ -45,6 +45,22 @@
#include <tests/replication.h>
#include <tests/debug.h>
+#include "tests/libmemcached-1.0/setup_and_teardowns.h"
+
+test_return_t check_replication_sanity_TEST(memcached_st *memc)
+{
+ test_true(memc);
+ test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL));
+
+ /*
+ * Make sure that we store the item on all servers
+ * (master + replicas == number of servers)
+ */
+ test_compare(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS), uint64_t(memcached_server_count(memc) - 1));
+
+ return TEST_SUCCESS;
+}
+
test_return_t replication_set_test(memcached_st *memc)
{
memcached_return_t rc;
@@ -116,8 +132,8 @@
uint32_t flags;
char *val= memcached_get_by_key(memc_clone, key, 1, "bubba", 5,
&len, &flags, &rc);
- test_true(rc == MEMCACHED_SUCCESS);
- test_true(val != NULL);
+ test_compare(MEMCACHED_SUCCESS, rc);
+ test_true(val);
free(val);
}
@@ -185,7 +201,7 @@
{
hits++;
}
- test_true(hits == 4);
+ test_compare(4, hits);
memcached_result_free(&result_obj);
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/sasl.cc
^
|
| @@ -106,16 +106,7 @@
world->_create= (test_callback_create_fn*)world_create;
world->_destroy= (test_callback_destroy_fn*)world_destroy;
- world->item._startup= (test_callback_fn*)world_test_startup;
- world->item.set_pre((test_callback_fn*)world_pre_run);
- world->item.set_flush((test_callback_fn*)world_flush);
- world->item.set_post((test_callback_fn*)world_post_run);
- world->_on_error= (test_callback_error_fn*)world_on_error;
-
- world->collection_startup= (test_callback_fn*)world_container_startup;
- world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
-
- world->set_runner(&defualt_libmemcached_runner);
+ world->set_runner(new LibmemcachedRunner);
world->set_sasl("memcached", "memcached");
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/setup_and_teardowns.cc
^
|
| @@ -40,6 +40,7 @@
#include <libmemcached/util.h>
+#include "tests/print.h"
#include "tests/libmemcached-1.0/setup_and_teardowns.h"
#include <sys/stat.h>
@@ -61,12 +62,20 @@
*/
test_return_t pre_binary(memcached_st *memc)
{
+ test_true(memcached_server_count(memc) > 0);
test_skip(true, libmemcached_util_version_check(memc, 1, 4, 4));
test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, true));
return TEST_SUCCESS;
}
+test_return_t pre_buffer(memcached_st *memc)
+{
+ test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, true));
+
+ return TEST_SUCCESS;
+}
+
test_return_t pre_unix_socket(memcached_st *memc)
{
struct stat buf;
@@ -218,30 +227,6 @@
return TEST_SUCCESS;
}
-test_return_t pre_cork(memcached_st *memc)
-{
-#ifdef __APPLE__
- return TEST_SKIPPED;
-#endif
- bool set= true;
- if (memcached_success(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CORK, set)))
- return TEST_SUCCESS;
-
- return TEST_SKIPPED;
-}
-
-test_return_t pre_cork_and_nonblock(memcached_st *memc)
-{
-#ifdef __APPLE__
- return TEST_SKIPPED;
-#endif
- test_return_t test_rc;
- if ((test_rc= pre_cork(memc)) != TEST_SUCCESS)
- return test_rc;
-
- return pre_nonblock(memc);
-}
-
test_return_t pre_nonblock_binary(memcached_st *memc)
{
memcached_st *memc_clone= memcached_clone(NULL, memc);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached-1.0/setup_and_teardowns.h
^
|
| @@ -60,3 +60,4 @@
test_return_t pre_replication_noblock(memcached_st*);
test_return_t pre_settimer(memcached_st*);
test_return_t pre_unix_socket(memcached_st*);
+test_return_t pre_buffer(memcached_st*);
|
|
[-]
[+]
|
Added |
libmemcached-1.0.7.tar.bz2/tests/libmemcached_test_container.h
^
|
| @@ -0,0 +1,81 @@
+/* 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
+
+/* The structure we use for the test system */
+struct libmemcached_test_container_st
+{
+private:
+ memcached_st *_parent;
+
+public:
+ libtest::server_startup_st& construct;
+
+ libmemcached_test_container_st(libtest::server_startup_st &construct_arg) :
+ _parent(NULL),
+ construct(construct_arg)
+ { }
+
+ memcached_st* parent()
+ {
+ return _parent;
+ }
+
+ void parent(memcached_st* arg)
+ {
+ reset();
+ _parent= arg;
+ }
+
+ void reset()
+ {
+ if (_parent)
+ {
+ memcached_free(_parent);
+ _parent= NULL;
+ }
+ }
+
+ ~libmemcached_test_container_st()
+ {
+ reset();
+ }
+};
+
+
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached_world.h
^
|
| @@ -39,19 +39,7 @@
#pragma once
-/* The structure we use for the test system */
-struct libmemcached_test_container_st
-{
- libtest::server_startup_st& construct;
- memcached_st *parent;
- memcached_st *memc;
-
- libmemcached_test_container_st(libtest::server_startup_st &construct_arg) :
- construct(construct_arg),
- parent(NULL),
- memc(NULL)
- { }
-};
+#include "tests/libmemcached_test_container.h"
static void *world_create(libtest::server_startup_st& servers, test_return_t& error)
{
@@ -99,98 +87,6 @@
return global_container;
}
-static test_return_t world_container_startup(libmemcached_test_container_st *container)
-{
- char buffer[BUFSIZ];
-
- test_compare_got(MEMCACHED_SUCCESS,
- libmemcached_check_configuration(container->construct.option_string().c_str(), container->construct.option_string().size(),
- buffer, sizeof(buffer)),
- container->construct.option_string().c_str());
-
- test_null(container->parent);
- container->parent= memcached(container->construct.option_string().c_str(), container->construct.option_string().size());
- test_true(container->parent);
- test_compare(MEMCACHED_SUCCESS, memcached_version(container->parent));
-
- if (container->construct.sasl())
- {
- if (memcached_failed(memcached_behavior_set(container->parent, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1)))
- {
- memcached_free(container->parent);
- return TEST_FAILURE;
- }
-
- if (memcached_failed(memcached_set_sasl_auth_data(container->parent, container->construct.username().c_str(), container->construct.password().c_str())))
- {
- memcached_free(container->parent);
- return TEST_FAILURE;
- }
- }
-
- return TEST_SUCCESS;
-}
-
-static test_return_t world_container_shutdown(libmemcached_test_container_st *container)
-{
- memcached_free(container->parent);
- container->parent= NULL;
-
- return TEST_SUCCESS;
-}
-
-static test_return_t world_test_startup(libmemcached_test_container_st *container)
-{
- test_true(container);
- test_null(container->memc);
- test_true(container->parent);
- container->memc= memcached_clone(NULL, container->parent);
- test_true(container->memc);
-
- return TEST_SUCCESS;
-}
-
-test_return_t world_flush(libmemcached_test_container_st *container);
-test_return_t world_flush(libmemcached_test_container_st *container)
-{
- test_true(container->memc);
- memcached_flush(container->memc, 0);
- memcached_quit(container->memc);
-
- return TEST_SUCCESS;
-}
-
-static test_return_t world_pre_run(libmemcached_test_container_st *container)
-{
- test_true(container->memc);
- for (uint32_t loop= 0; loop < memcached_server_list_count(container->memc->servers); loop++)
- {
- memcached_server_instance_st instance= memcached_server_instance_by_position(container->memc, loop);
-
- test_compare(-1, instance->fd);
- test_compare(0U, instance->cursor_active);
- }
-
- return TEST_SUCCESS;
-}
-
-
-static test_return_t world_post_run(libmemcached_test_container_st *container)
-{
- test_true(container->memc);
-
- return TEST_SUCCESS;
-}
-
-static test_return_t world_on_error(test_return_t , libmemcached_test_container_st *container)
-{
- test_true(container->memc);
- memcached_free(container->memc);
- container->memc= NULL;
-
- return TEST_SUCCESS;
-}
-
static bool world_destroy(void *object)
{
libmemcached_test_container_st *container= (libmemcached_test_container_st *)object;
@@ -208,67 +104,4 @@
typedef test_return_t (*libmemcached_test_callback_fn)(memcached_st *);
-class LibmemcachedRunner : public libtest::Runner {
-public:
- test_return_t run(test_callback_fn* func, void *object)
- {
- return _runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
- }
-
- test_return_t pre(test_callback_fn* func, void *object)
- {
- return _pre_runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
- }
-
- test_return_t post(test_callback_fn* func, void *object)
- {
- return _post_runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
- }
-
-private:
- test_return_t _runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
- {
- test_compare(true, check());
-
- if (func)
- {
- test_true(container);
- test_true(container->memc);
- test_return_t ret;
- try {
- ret= func(container->memc);
- }
- catch (std::exception& e)
- {
- libtest::Error << e.what();
- return TEST_FAILURE;
- }
-
- return ret;
- }
-
- return TEST_SUCCESS;
- }
-
- test_return_t _pre_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
- {
- if (func)
- {
- return func(container->parent);
- }
-
- return TEST_SUCCESS;
- }
-
- test_return_t _post_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
- {
- if (func)
- {
- return func(container->parent);
- }
-
- return TEST_SUCCESS;
- }
-};
-
-static LibmemcachedRunner defualt_libmemcached_runner;
+#include "tests/runner.h"
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/libmemcached_world_socket.h
^
|
| @@ -41,19 +41,7 @@
#include <cassert>
-/* The structure we use for the test system */
-struct libmemcached_test_container_st
-{
- libtest::server_startup_st& construct;
- memcached_st *parent;
- memcached_st *memc;
-
- libmemcached_test_container_st(libtest::server_startup_st &construct_arg) :
- construct(construct_arg),
- parent(NULL),
- memc(NULL)
- { }
-};
+#include "tests/libmemcached_test_container.h"
static void *world_create(libtest::server_startup_st& servers, test_return_t& error)
{
@@ -80,99 +68,6 @@
return global_container;
}
-static test_return_t world_container_startup(libmemcached_test_container_st *container)
-{
- char buffer[BUFSIZ];
-
- test_compare_got(MEMCACHED_SUCCESS,
- libmemcached_check_configuration(container->construct.option_string().c_str(), container->construct.option_string().size(),
- buffer, sizeof(buffer)),
- container->construct.option_string().c_str());
-
- test_null(container->parent);
- container->parent= memcached(container->construct.option_string().c_str(), container->construct.option_string().size());
- test_true(container->parent);
- test_compare(MEMCACHED_SUCCESS, memcached_version(container->parent));
-
- if (container->construct.sasl())
- {
- if (memcached_failed(memcached_behavior_set(container->parent, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1)))
- {
- memcached_free(container->parent);
- return TEST_FAILURE;
- }
-
- if (memcached_failed(memcached_set_sasl_auth_data(container->parent, container->construct.username().c_str(), container->construct.password().c_str())))
- {
- memcached_free(container->parent);
- return TEST_FAILURE;
- }
- }
-
- return TEST_SUCCESS;
-}
-
-static test_return_t world_container_shutdown(libmemcached_test_container_st *container)
-{
- memcached_free(container->parent);
- container->parent= NULL;
-
- return TEST_SUCCESS;
-}
-
-static test_return_t world_test_startup(libmemcached_test_container_st *container)
-{
- test_true(container);
- test_null(container->memc);
- test_true(container->parent);
- container->memc= memcached_clone(NULL, container->parent);
- test_true(container->memc);
-
- return TEST_SUCCESS;
-}
-
-test_return_t world_flush(libmemcached_test_container_st *container);
-test_return_t world_flush(libmemcached_test_container_st *container)
-{
- test_true(container->memc);
- memcached_flush(container->memc, 0);
- memcached_quit(container->memc);
-
- return TEST_SUCCESS;
-}
-
-static test_return_t world_pre_run(libmemcached_test_container_st *container)
-{
- test_true(container->memc);
- for (uint32_t loop= 0; loop < memcached_server_list_count(container->memc->servers); loop++)
- {
- memcached_server_instance_st instance=
- memcached_server_instance_by_position(container->memc, loop);
-
- test_compare(-1, instance->fd);
- test_compare(0U, instance->cursor_active);
- }
-
- return TEST_SUCCESS;
-}
-
-
-static test_return_t world_post_run(libmemcached_test_container_st *container)
-{
- test_true(container->memc);
-
- return TEST_SUCCESS;
-}
-
-static test_return_t world_on_error(test_return_t , libmemcached_test_container_st *container)
-{
- test_true(container->memc);
- memcached_free(container->memc);
- container->memc= NULL;
-
- return TEST_SUCCESS;
-}
-
static bool world_destroy(void *object)
{
libmemcached_test_container_st *container= (libmemcached_test_container_st *)object;
@@ -190,64 +85,4 @@
typedef test_return_t (*libmemcached_test_callback_fn)(memcached_st *);
-static test_return_t _runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
-{
- if (func)
- {
- test_true(container);
- test_true(container->memc);
- test_return_t ret;
- try {
- ret= func(container->memc);
- }
- catch (std::exception& e)
- {
- libtest::Error << e.what();
- return TEST_FAILURE;
- }
-
- return ret;
- }
-
- return TEST_SUCCESS;
-}
-
-static test_return_t _pre_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
-{
- if (func)
- {
- return func(container->parent);
- }
-
- return TEST_SUCCESS;
-}
-
-static test_return_t _post_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
-{
- if (func)
- {
- return func(container->parent);
- }
-
- return TEST_SUCCESS;
-}
-
-class LibmemcachedRunner : public libtest::Runner {
-public:
- test_return_t run(test_callback_fn* func, void *object)
- {
- return _runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
- }
-
- test_return_t pre(test_callback_fn* func, void *object)
- {
- return _pre_runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
- }
-
- test_return_t post(test_callback_fn* func, void *object)
- {
- return _post_runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
- }
-};
-
-static LibmemcachedRunner defualt_libmemcached_runner;
+#include "tests/runner.h"
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/mem_udp.cc
^
|
| @@ -571,14 +571,5 @@
world->_create= (test_callback_create_fn*)world_create;
world->_destroy= (test_callback_destroy_fn*)world_destroy;
- world->item._startup= (test_callback_fn*)world_test_startup;
- world->item._flush= (test_callback_fn*)world_flush;
- world->item.set_pre((test_callback_fn*)world_pre_run);
- world->item.set_post((test_callback_fn*)world_post_run);
- world->_on_error= (test_callback_error_fn*)world_on_error;
-
- world->collection_startup= (test_callback_fn*)world_container_startup;
- world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
-
- world->set_runner(&defualt_libmemcached_runner);
+ world->set_runner(new LibmemcachedRunner);
}
|
|
[-]
[+]
|
Added |
libmemcached-1.0.7.tar.bz2/tests/memc.h
^
|
| @@ -0,0 +1,80 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Gearmand client and server library.
+ *
+ * Copyright (C) 2011 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
+
+class Memc {
+public:
+ Memc()
+ {
+ _memc= memcached_create(NULL);
+
+ if (_memc == NULL)
+ {
+ throw "memcached_create() failed";
+ }
+ }
+
+ Memc(memcached_st* arg)
+ {
+ _memc= memcached_clone(NULL, arg);
+
+ if (_memc == NULL)
+ {
+ throw "memcached_clone() failed";
+ }
+ }
+
+ memcached_st* operator&() const
+ {
+ return _memc;
+ }
+
+ memcached_st* operator->() const
+ {
+ return _memc;
+ }
+
+ ~Memc()
+ {
+ memcached_free(_memc);
+ }
+
+private:
+ memcached_st *_memc;
+
+};
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/print.h
^
|
| @@ -40,3 +40,9 @@
memcached_return_t server_print_callback(const memcached_st *ptr,
const memcached_server_st *server,
void *context);
+
+memcached_return_t server_print_version_callback(const memcached_st *ptr,
+ const memcached_server_st *server,
+ void *context);
+
+const char * print_version(memcached_st *memc);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/tests/replication.h
^
|
| @@ -50,3 +50,5 @@
test_return_t replication_randomize_mget_fail_test(memcached_st *memc);
test_return_t replication_miss_test(memcached_st *memc);
+
+test_return_t check_replication_sanity_TEST(memcached_st*);
|
|
[-]
[+]
|
Added |
libmemcached-1.0.7.tar.bz2/tests/runner.h
^
|
| @@ -0,0 +1,159 @@
+/* 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
+
+#include "tests/libmemcached-1.0/generate.h"
+#include "tests/memc.h"
+#include "tests/print.h"
+
+class LibmemcachedRunner : public libtest::Runner {
+public:
+ test_return_t run(test_callback_fn* func, void *object)
+ {
+ return _runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
+ }
+
+ test_return_t flush(void* arg)
+ {
+ return flush((libmemcached_test_container_st*)arg);
+ }
+
+ test_return_t flush(libmemcached_test_container_st *container)
+ {
+ Memc memc(container->parent());
+ memcached_flush(&memc, 0);
+ memcached_quit(&memc);
+
+ return TEST_SUCCESS;
+ }
+
+ test_return_t pre(test_callback_fn* func, void *object)
+ {
+ return _pre_runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
+ }
+
+ test_return_t post(test_callback_fn* func, void *object)
+ {
+ return _post_runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
+ }
+
+private:
+ test_return_t _runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
+ {
+ test_true(container);
+ test_true(container->parent());
+ Memc memc(container->parent());
+
+ test_compare(true, check());
+
+ test_return_t ret= TEST_SUCCESS;
+ if (func)
+ {
+ test_true(container);
+ try {
+ ret= func(&memc);
+ }
+ catch (std::exception& e)
+ {
+ libtest::Error << e.what();
+ ret= TEST_FAILURE;
+ }
+ }
+
+ return ret;
+ }
+
+ test_return_t _pre_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
+ {
+ container->reset();
+ {
+ char buffer[BUFSIZ];
+
+ test_compare_got(MEMCACHED_SUCCESS,
+ libmemcached_check_configuration(container->construct.option_string().c_str(), container->construct.option_string().size(),
+ buffer, sizeof(buffer)),
+ container->construct.option_string().c_str());
+
+ test_null(container->parent());
+ container->parent(memcached(container->construct.option_string().c_str(), container->construct.option_string().size()));
+ test_true(container->parent());
+ test_compare(MEMCACHED_SUCCESS, memcached_version(container->parent()));
+
+ if (container->construct.sasl())
+ {
+ if (memcached_failed(memcached_behavior_set(container->parent(), MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1)))
+ {
+ container->reset();
+ return TEST_FAILURE;
+ }
+
+ if (memcached_failed(memcached_set_sasl_auth_data(container->parent(), container->construct.username().c_str(), container->construct.password().c_str())))
+ {
+ container->reset();
+ return TEST_FAILURE;
+ }
+ }
+ }
+
+ test_compare(true, check());
+
+ if (func)
+ {
+ return func(container->parent());
+ }
+
+ return TEST_SUCCESS;
+ }
+
+ test_return_t _post_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
+ {
+ test_compare(true, check());
+ cleanup_pairs(NULL);
+
+ test_return_t rc= TEST_SUCCESS;
+ if (func)
+ {
+ rc= func(container->parent());
+ }
+ container->reset();
+
+ return rc;
+ }
+};
+
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/util/log.hpp
^
|
| @@ -1,22 +1,37 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
+ * Data Differential Utility library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.7.tar.bz2/util/signal.hpp
^
|
| @@ -1,26 +1,39 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential Utility library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
#pragma once
#include <pthread.h>
|
