From 23dca174eef8d846e3d4402729b57f6ded035e64 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Sun, 28 Oct 2012 20:38:35 -0400 Subject: [PATCH] Update all config.h usage. --- .bzrignore | 6 ++-- Makefile.am | 2 +- clients/execute.cc | 2 +- clients/generator.cc | 2 +- clients/memcapable.cc | 2 +- clients/memcat.cc | 2 +- clients/memcp.cc | 2 +- clients/memdump.cc | 2 +- clients/memerror.cc | 2 +- clients/memexist.cc | 2 +- clients/memflush.cc | 2 +- clients/memparse.cc | 2 +- clients/memping.cc | 2 +- clients/memrm.cc | 2 +- clients/memslap.cc | 2 +- clients/memstat.cc | 2 +- clients/memtouch.cc | 2 +- clients/utilities.cc | 2 +- configure.ac | 24 ++++++------- example/byteorder.cc | 2 +- example/memcached_light.cc | 2 +- example/t/memcached_light.cc | 2 +- libhashkit/common.h | 2 +- libmemcached/common.h | 2 +- libmemcached/memory.h | 2 +- libmemcachedutil/common.h | 2 +- libtest/alarm.cc | 2 +- libtest/binaries.cc | 2 +- libtest/blobslap_worker.cc | 2 +- libtest/cmdline.cc | 9 ++--- libtest/cmdline.h | 16 +++------ libtest/collection.cc | 2 +- libtest/common.h | 35 ++++++++----------- libtest/comparison.cc | 2 +- libtest/core.cc | 2 +- libtest/core_count.cc | 2 +- libtest/cpu.cc | 2 +- libtest/dns.cc | 2 +- libtest/dream.cc | 2 +- libtest/drizzled.cc | 2 +- libtest/drizzled.h | 2 ++ libtest/failed.cc | 2 +- libtest/fatal.cc | 2 +- libtest/formatter.cc | 2 +- libtest/framework.cc | 2 +- libtest/gearmand.cc | 34 +++--------------- libtest/has.cc | 2 +- libtest/http.cc | 2 +- libtest/include.am | 2 ++ libtest/is_local.cc | 2 +- libtest/killpid.cc | 2 +- libtest/libtool.cc | 2 +- libtest/main.cc | 14 ++++---- libtest/memcached.cc | 33 ++++------------- libtest/port.cc | 2 +- libtest/runner.cc | 2 +- libtest/server.cc | 2 +- libtest/server.h | 11 ++---- libtest/server_container.cc | 2 +- libtest/server_container.h | 3 +- libtest/signal.cc | 2 +- libtest/skiptest.cc | 2 +- libtest/socket.cc | 2 +- libtest/strerror.cc | 2 +- libtest/test.hpp | 18 ++-------- libtest/timer.cc | 2 +- libtest/timer.hpp | 5 ++- libtest/tmpfile.cc | 1 - libtest/unittest.cc | 2 +- libtest/vchar.cc | 2 +- libtest/wait.cc | 2 +- tests/cpp_example.cc | 2 +- tests/cycle.cc | 2 +- tests/failure.cc | 2 +- tests/hash_plus.cc | 2 +- tests/hashkit_functions.cc | 2 +- tests/libmemcached-1.0/all_tests.cc | 2 +- tests/libmemcached-1.0/all_tests_socket.cc | 2 +- tests/libmemcached-1.0/atomsmasher.cc | 2 +- tests/libmemcached-1.0/basic.cc | 2 +- tests/libmemcached-1.0/callback_counter.cc | 2 +- tests/libmemcached-1.0/callbacks.cc | 2 +- tests/libmemcached-1.0/debug.cc | 2 +- tests/libmemcached-1.0/deprecated.cc | 2 +- tests/libmemcached-1.0/dump.cc | 2 +- tests/libmemcached-1.0/encoding_key.cc | 2 +- tests/libmemcached-1.0/error_conditions.cc | 2 +- tests/libmemcached-1.0/exist.cc | 2 +- tests/libmemcached-1.0/fetch_all_results.cc | 2 +- tests/libmemcached-1.0/generate.cc | 2 +- tests/libmemcached-1.0/haldenbrand.cc | 2 +- tests/libmemcached-1.0/internals.cc | 2 +- tests/libmemcached-1.0/ketama.cc | 2 +- tests/libmemcached-1.0/mem_functions.cc | 2 +- .../memcached_fetch_execute.cc | 2 +- tests/libmemcached-1.0/memcached_get.cc | 2 +- tests/libmemcached-1.0/namespace.cc | 2 +- tests/libmemcached-1.0/parser.cc | 2 +- tests/libmemcached-1.0/plus.cpp | 2 +- tests/libmemcached-1.0/pool.cc | 2 +- tests/libmemcached-1.0/print.cc | 2 +- tests/libmemcached-1.0/replication.cc | 2 +- tests/libmemcached-1.0/sasl.cc | 2 +- tests/libmemcached-1.0/server_add.cc | 2 +- tests/libmemcached-1.0/setup_and_teardowns.cc | 2 +- tests/libmemcached-1.0/stat.cc | 2 +- tests/libmemcached-1.0/string.cc | 2 +- tests/libmemcached-1.0/touch.cc | 2 +- tests/libmemcached-1.0/virtual_buckets.cc | 2 +- tests/mem_udp.cc | 2 +- tests/memcapable.cc | 2 +- tests/memcat.cc | 2 +- tests/memcp.cc | 2 +- tests/memdump.cc | 2 +- tests/memerror.cc | 2 +- tests/memexist.cc | 2 +- tests/memflush.cc | 2 +- tests/memrm.cc | 2 +- tests/memslap.cc | 2 +- tests/memstat.cc | 2 +- tests/memtouch.cc | 2 +- tests/parser.cc | 2 +- util/daemon.cc | 2 +- util/instance.cc | 2 +- util/operation.cc | 2 +- util/signal.cc | 2 +- 126 files changed, 181 insertions(+), 254 deletions(-) diff --git a/.bzrignore b/.bzrignore index edf4f4c2..ec7e48cd 100644 --- a/.bzrignore +++ b/.bzrignore @@ -49,9 +49,9 @@ clients/memrm clients/memslap clients/memstat clients/memtouch -config.h -config.h.in -config.in +mem_config.h +mem_config.h.in +mem_config.in config.log config.status config/compile diff --git a/Makefile.am b/Makefile.am index dcf1519a..d87bd414 100644 --- a/Makefile.am +++ b/Makefile.am @@ -128,7 +128,7 @@ maintainer-clean-local: -rm -f build-aux/install-sh -rm -f build-aux/ltmain.sh -rm -f build-aux/missing - -rm -f config.in + -rm -f mem_config.in -rm -f config.log -rm -f config.status -rm -f configure diff --git a/clients/execute.cc b/clients/execute.cc index cf7779e5..3e9e4802 100644 --- a/clients/execute.cc +++ b/clients/execute.cc @@ -15,7 +15,7 @@ Return the number of rows set. */ -#include +#include #include "clients/execute.h" unsigned int execute_set(memcached_st *memc, pairs_st *pairs, unsigned int number_of) diff --git a/clients/generator.cc b/clients/generator.cc index e41d9c58..b2ba67ca 100644 --- a/clients/generator.cc +++ b/clients/generator.cc @@ -10,7 +10,7 @@ * */ -#include +#include #include diff --git a/clients/memcapable.cc b/clients/memcapable.cc index 2026acee..c8d294f9 100644 --- a/clients/memcapable.cc +++ b/clients/memcapable.cc @@ -13,7 +13,7 @@ /* -*- Mode: C; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */ #undef NDEBUG -#include +#include #ifdef HAVE_POLL_H #include diff --git a/clients/memcat.cc b/clients/memcat.cc index ef287781..92dce5d3 100644 --- a/clients/memcat.cc +++ b/clients/memcat.cc @@ -10,7 +10,7 @@ * */ -#include +#include #include #include diff --git a/clients/memcp.cc b/clients/memcp.cc index 4ad0919d..1551a1d5 100644 --- a/clients/memcp.cc +++ b/clients/memcp.cc @@ -10,7 +10,7 @@ * */ -#include "config.h" +#include "mem_config.h" #include #include diff --git a/clients/memdump.cc b/clients/memdump.cc index 5b333728..bcd277c2 100644 --- a/clients/memdump.cc +++ b/clients/memdump.cc @@ -10,7 +10,7 @@ * */ -#include "config.h" +#include "mem_config.h" #include #include diff --git a/clients/memerror.cc b/clients/memerror.cc index 910b2a6d..bc9a6a75 100644 --- a/clients/memerror.cc +++ b/clients/memerror.cc @@ -9,7 +9,7 @@ * Summary: * */ -#include "config.h" +#include "mem_config.h" #include #include diff --git a/clients/memexist.cc b/clients/memexist.cc index af9a72c9..34d38936 100644 --- a/clients/memexist.cc +++ b/clients/memexist.cc @@ -9,7 +9,7 @@ * Summary: * */ -#include "config.h" +#include "mem_config.h" #include #include diff --git a/clients/memflush.cc b/clients/memflush.cc index 5342d757..67df7c7a 100644 --- a/clients/memflush.cc +++ b/clients/memflush.cc @@ -9,7 +9,7 @@ * Summary: * */ -#include "config.h" +#include "mem_config.h" #include #include diff --git a/clients/memparse.cc b/clients/memparse.cc index ab4cee9e..fc2cb0c7 100644 --- a/clients/memparse.cc +++ b/clients/memparse.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include diff --git a/clients/memping.cc b/clients/memping.cc index f4fcec86..983447f1 100644 --- a/clients/memping.cc +++ b/clients/memping.cc @@ -9,7 +9,7 @@ * Summary: * */ -#include "config.h" +#include "mem_config.h" #include #include diff --git a/clients/memrm.cc b/clients/memrm.cc index 3b7f8a4b..a559ef90 100644 --- a/clients/memrm.cc +++ b/clients/memrm.cc @@ -9,7 +9,7 @@ * Summary: * */ -#include "config.h" +#include "mem_config.h" #include #include diff --git a/clients/memslap.cc b/clients/memslap.cc index 777820a0..295ea0db 100644 --- a/clients/memslap.cc +++ b/clients/memslap.cc @@ -36,7 +36,7 @@ */ -#include +#include #include #include diff --git a/clients/memstat.cc b/clients/memstat.cc index 6fd42d6c..e50f2453 100644 --- a/clients/memstat.cc +++ b/clients/memstat.cc @@ -12,7 +12,7 @@ * Brian Aker * Toru Maesaka */ -#include +#include #include #include diff --git a/clients/memtouch.cc b/clients/memtouch.cc index 8bb3c78c..73429e23 100644 --- a/clients/memtouch.cc +++ b/clients/memtouch.cc @@ -10,7 +10,7 @@ * */ -#include +#include #include #include diff --git a/clients/utilities.cc b/clients/utilities.cc index ddc83eda..5f5958e2 100644 --- a/clients/utilities.cc +++ b/clients/utilities.cc @@ -9,7 +9,7 @@ * Summary: * */ -#include +#include #include diff --git a/configure.ac b/configure.ac index 90d5abde..b98efaf3 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE([1.11 color-tests -Wno-portability subdir-objects foreign tar-u AC_PREREQ([2.61]) -AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS. +AC_CONFIG_HEADERS([mem_config.h:mem_config.in])dnl Keep filename to 8.3 for MS-DOS. AC_CONFIG_SRCDIR([libmemcached/memcached.cc]) #shared library versioning @@ -254,17 +254,17 @@ dnl If you want to add support for other platforms you should check for dnl your requirements, define HAVE_DROP_PRIVILEGES, and make sure you add dnl the source file containing the implementation into memcached_SOURCE dnl in Makefile.am -AC_CHECK_FUNCS([setppriv], [ - AC_CHECK_HEADER([priv.h], [ - AC_DEFINE([HAVE_DROP_PRIVILEGES], 1, - [Define this if you have an implementation of drop_privileges()]) - build_solaris_privs=yes - ], []) -],[]) - -AC_CHECK_HEADERS_ONCE(winsock2.h poll.h sys/wait.h fnmatch.h) -AM_CONDITIONAL(BUILD_POLL, test "x$ac_cv_header_poll_h" = "xno") -AM_CONDITIONAL(BUILD_WIN32_WRAPPERS, test "x$ac_cv_header_winsock2_h" = "xyes") +AC_CHECK_FUNCS([setppriv], + [AC_CHECK_HEADER([priv.h], + [AC_DEFINE([HAVE_DROP_PRIVILEGES], + [1], + [Define this if you have an implementation of drop_privileges()]) + build_solaris_privs=yes]) + ]) + +AC_CHECK_HEADERS_ONCE([winsock2.h poll.h sys/wait.h fnmatch.h]) +AM_CONDITIONAL([BUILD_POLL],[test "x$ac_cv_header_poll_h" = "xno"]) +AM_CONDITIONAL([BUILD_WIN32_WRAPPERS],[test "x$ac_cv_header_winsock2_h" = "xyes"]) AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes", [AM_LDFLAGS="$AM_LDFLAGS -lws2_32" AM_CFLAGS="$AM_CFLAGS $NO_WERROR" diff --git a/example/byteorder.cc b/example/byteorder.cc index 5b25624a..fdfa0217 100644 --- a/example/byteorder.cc +++ b/example/byteorder.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include diff --git a/example/memcached_light.cc b/example/memcached_light.cc index 3f14c8ee..c5385d75 100644 --- a/example/memcached_light.cc +++ b/example/memcached_light.cc @@ -23,7 +23,7 @@ * the library) */ -#include +#include #include #include diff --git a/example/t/memcached_light.cc b/example/t/memcached_light.cc index c5956b24..bfb78b91 100644 --- a/example/t/memcached_light.cc +++ b/example/t/memcached_light.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include #include diff --git a/libhashkit/common.h b/libhashkit/common.h index 14423597..7affeb36 100644 --- a/libhashkit/common.h +++ b/libhashkit/common.h @@ -37,7 +37,7 @@ #pragma once -#include +#include #include #include diff --git a/libmemcached/common.h b/libmemcached/common.h index 81088632..53e083a4 100644 --- a/libmemcached/common.h +++ b/libmemcached/common.h @@ -42,7 +42,7 @@ #pragma once -#include +#include #ifdef __cplusplus # include diff --git a/libmemcached/memory.h b/libmemcached/memory.h index 804bde30..12d02849 100644 --- a/libmemcached/memory.h +++ b/libmemcached/memory.h @@ -36,7 +36,7 @@ #pragma once -#include +#include #include diff --git a/libmemcachedutil/common.h b/libmemcachedutil/common.h index ec00877a..6afd7968 100644 --- a/libmemcachedutil/common.h +++ b/libmemcachedutil/common.h @@ -38,7 +38,7 @@ #pragma once -#include "config.h" +#include "mem_config.h" #include #include diff --git a/libtest/alarm.cc b/libtest/alarm.cc index 08ac787c..2d662622 100644 --- a/libtest/alarm.cc +++ b/libtest/alarm.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/binaries.cc b/libtest/binaries.cc index d5e0cc72..f58378f7 100644 --- a/libtest/binaries.cc +++ b/libtest/binaries.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" namespace libtest { diff --git a/libtest/blobslap_worker.cc b/libtest/blobslap_worker.cc index dbd41ac6..a6237b34 100644 --- a/libtest/blobslap_worker.cc +++ b/libtest/blobslap_worker.cc @@ -35,7 +35,7 @@ */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc index ce98acb1..360e38ea 100644 --- a/libtest/cmdline.cc +++ b/libtest/cmdline.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include using namespace libtest; @@ -45,6 +45,8 @@ using namespace libtest; #include #include #include +#include +#include #include #include #include @@ -422,8 +424,7 @@ Application::error_t Application::join() } else if WIFSIGNALED(_status) { - // memcached will die with SIGHUP - if (WTERMSIG(_status) != SIGTERM and WTERMSIG(_status) != SIGHUP) + if (WTERMSIG(_status) != SIGTERM) { _app_exit_state= Application::INVALID_POSIX_SPAWN; std::string error_string(built_argv[0]); @@ -433,7 +434,7 @@ Application::error_t Application::join() } _app_exit_state= Application::SIGTERM_KILLED; - Out << "waitpid() application terminated at request" + Error << "waitpid() application terminated at request" << " pid:" << _pid << " name:" << built_argv[0]; } diff --git a/libtest/cmdline.h b/libtest/cmdline.h index ca7098dd..ae4d9ba1 100644 --- a/libtest/cmdline.h +++ b/libtest/cmdline.h @@ -36,24 +36,18 @@ #pragma once -#ifdef HAVE_SPAWN_H -# include -#endif - -/* - http://www.gnu.org/software/automake/manual/automake.html#Tests - When no test protocol is in use, an exit status of 0 from a test script will denote a success, an exit status of 77 a skipped test, an exit status of 99 an hard error, and any other exit status will denote a failure. -*/ +#include +// http://www.gnu.org/software/automake/manual/automake.html#Using-the-TAP-test-protocol #define EXIT_SKIP 77 -#define EXIT_FATAL 99 +#define EXIT_FATAL 77 #ifndef EX_NOEXEC -# define EX_NOEXEC 126 +# define EX_NOEXEC 126 #endif #ifndef EX_NOTFOUND -# define EX_NOTFOUND 127 +# define EX_NOTFOUND 127 #endif namespace libtest { diff --git a/libtest/collection.cc b/libtest/collection.cc index 3bf571e8..dda1341a 100644 --- a/libtest/collection.cc +++ b/libtest/collection.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include diff --git a/libtest/common.h b/libtest/common.h index 20b48258..6c7e294c 100644 --- a/libtest/common.h +++ b/libtest/common.h @@ -46,45 +46,40 @@ #include #ifdef HAVE_SYS_TYPES_H -#include +# include #endif #ifdef HAVE_SYS_TIME_H -#include +# include #endif #ifdef HAVE_SYS_WAIT_H -#include +# include #endif #ifdef HAVE_SYS_RESOURCE_H -#include +# include #endif #ifdef HAVE_FNMATCH_H -#include -#endif - -#ifdef HAVE_NETDB_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include +# include #endif #ifdef HAVE_ARPA_INET_H # include #endif -#ifdef HAVE_POLL_H -# include +#if defined(WIN32) || defined(__MINGW32__) +# include "win32/wrappers.h" +# define get_socket_errno() WSAGetLastError() #else -# include "poll/poll.h" -#endif - -#ifdef HAVE_SPAWN_H -# include +# ifdef HAVE_UNISTD_H +# include +# endif +# define INVALID_SOCKET -1 +# define SOCKET_ERROR -1 +# define closesocket(a) close(a) +# define get_socket_errno() errno #endif #include diff --git a/libtest/comparison.cc b/libtest/comparison.cc index 0429cde8..c16399db 100644 --- a/libtest/comparison.cc +++ b/libtest/comparison.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include namespace libtest { diff --git a/libtest/core.cc b/libtest/core.cc index 0ebe3efd..eb2ac3a1 100644 --- a/libtest/core.cc +++ b/libtest/core.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include diff --git a/libtest/core_count.cc b/libtest/core_count.cc index 351ae1c0..3cab0b4f 100644 --- a/libtest/core_count.cc +++ b/libtest/core_count.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/cpu.cc b/libtest/cpu.cc index 4643e56d..a1844c5b 100644 --- a/libtest/cpu.cc +++ b/libtest/cpu.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/dns.cc b/libtest/dns.cc index 2bf094cb..a293caa3 100644 --- a/libtest/dns.cc +++ b/libtest/dns.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/dream.cc b/libtest/dream.cc index 7b93513e..ebd8291a 100644 --- a/libtest/dream.cc +++ b/libtest/dream.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include namespace libtest { diff --git a/libtest/drizzled.cc b/libtest/drizzled.cc index 49fe2969..3653eea2 100644 --- a/libtest/drizzled.cc +++ b/libtest/drizzled.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/drizzled.h b/libtest/drizzled.h index 3bc37555..c3e3055a 100644 --- a/libtest/drizzled.h +++ b/libtest/drizzled.h @@ -36,6 +36,8 @@ #pragma once +#include + namespace libtest { struct Server; } namespace libtest { diff --git a/libtest/failed.cc b/libtest/failed.cc index ae79e307..731d4998 100644 --- a/libtest/failed.cc +++ b/libtest/failed.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/fatal.cc b/libtest/fatal.cc index 890975e6..7178d7f9 100644 --- a/libtest/fatal.cc +++ b/libtest/fatal.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/formatter.cc b/libtest/formatter.cc index f19404d4..8e6b3ffb 100644 --- a/libtest/formatter.cc +++ b/libtest/formatter.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include diff --git a/libtest/framework.cc b/libtest/framework.cc index 8bc6e65c..9b351048 100644 --- a/libtest/framework.cc +++ b/libtest/framework.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc index c83f4eef..41a73d3c 100644 --- a/libtest/gearmand.cc +++ b/libtest/gearmand.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include @@ -57,8 +57,6 @@ using namespace libtest; #include #include -#include - #ifndef __INTEL_COMPILER #pragma GCC diagnostic ignored "-Wold-style-cast" #endif @@ -73,37 +71,15 @@ public: bool ping() { - gearman_client_st *client= gearman_client_create(NULL); - if (client == NULL) + if (out_of_ban_killed()) { - error("Could not allocate memory for gearman_client_create()"); return false; } - gearman_client_set_timeout(client, 4000); - - if (gearman_success(gearman_client_add_server(client, hostname().c_str(), port()))) - { - gearman_return_t rc= gearman_client_echo(client, test_literal_param("This is my echo test")); - - if (gearman_success(rc)) - { - gearman_client_free(client); - return true; - } - - if (out_of_ban_killed() == false) - { - error(gearman_client_error(client)); - } - } - else - { - error(gearman_client_error(client)); - } - gearman_client_free(client); + SimpleClient client(_hostname, _port); - return false;; + std::string response; + return client.send_message("version", response); } const char *name() diff --git a/libtest/has.cc b/libtest/has.cc index 9f8cf5ba..1e020a20 100644 --- a/libtest/has.cc +++ b/libtest/has.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/http.cc b/libtest/http.cc index 02d20cee..59497d69 100644 --- a/libtest/http.cc +++ b/libtest/http.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include diff --git a/libtest/include.am b/libtest/include.am index 5d05aa4a..b09fe364 100644 --- a/libtest/include.am +++ b/libtest/include.am @@ -42,6 +42,7 @@ BUILT_SOURCES+= libtest/version.h clean-libtest-check: -rm -rf tmp_chroot +noinst_HEADERS+= libtest/client.hpp noinst_HEADERS+= libtest/formatter.hpp noinst_HEADERS+= libtest/timer.hpp noinst_HEADERS+= libtest/alarm.h @@ -108,6 +109,7 @@ libtest_libtest_la_SOURCES+= libtest/dream.cc libtest_libtest_la_SOURCES+= libtest/drizzled.cc libtest_libtest_la_SOURCES+= libtest/fatal.cc libtest_libtest_la_SOURCES+= libtest/formatter.cc +libtest_libtest_la_SOURCES+= libtest/client.cc libtest_libtest_la_SOURCES+= libtest/framework.cc libtest_libtest_la_SOURCES+= libtest/has.cc libtest_libtest_la_SOURCES+= libtest/http.cc diff --git a/libtest/is_local.cc b/libtest/is_local.cc index 7ae7b7f4..b223dd99 100644 --- a/libtest/is_local.cc +++ b/libtest/is_local.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include diff --git a/libtest/killpid.cc b/libtest/killpid.cc index 5bf285c4..4f8f3370 100644 --- a/libtest/killpid.cc +++ b/libtest/killpid.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/libtool.cc b/libtest/libtool.cc index 64371eae..4a7d3cea 100644 --- a/libtest/libtool.cc +++ b/libtest/libtool.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/main.cc b/libtest/main.cc index d6c4ecbf..967ec71a 100644 --- a/libtest/main.cc +++ b/libtest/main.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include @@ -292,7 +292,7 @@ int main(int argc, char *argv[]) return EXIT_SKIP; case TEST_FAILURE: - std::cerr << __FILE__ << ":" << __LINE__ << ": " << "frame->create()" << std::endl; + std::cerr << "frame->create()" << std::endl; return EXIT_FAILURE; } } @@ -340,27 +340,27 @@ int main(int argc, char *argv[]) } catch (libtest::fatal& e) { - std::cerr << __FILE__ << ":" << __LINE__ << ": " << "FATAL:" << e.what() << std::endl; + std::cerr << "FATAL:" << e.what() << std::endl; exit_code= EXIT_FAILURE; } catch (libtest::disconnected& e) { - std::cerr << __FILE__ << ":" << __LINE__ << ": " << "Unhandled disconnection occurred:" << e.what() << std::endl; + std::cerr << "Unhandled disconnection occurred:" << e.what() << std::endl; exit_code= EXIT_FAILURE; } catch (std::exception& e) { - std::cerr << __FILE__ << ":" << __LINE__ << ": " << "std::exception:" << e.what() << std::endl; + std::cerr << "std::exception:" << e.what() << std::endl; exit_code= EXIT_FAILURE; } catch (char const*) { - std::cerr << __FILE__ << ":" << __LINE__ << ": " << "Exception:" << std::endl; + std::cerr << "Exception:" << std::endl; exit_code= EXIT_FAILURE; } catch (...) { - std::cerr << __FILE__ << ":" << __LINE__ << ": " << "Unknown exception halted execution." << std::endl; + std::cerr << "Unknown exception halted execution." << std::endl; exit_code= EXIT_FAILURE; } diff --git a/libtest/memcached.cc b/libtest/memcached.cc index 37a3102e..7d792075 100644 --- a/libtest/memcached.cc +++ b/libtest/memcached.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include @@ -124,36 +124,15 @@ public: bool ping() { -#if 0 - // Memcached is slow to start, so we need to do this - if (pid_file().empty() == false) + if (out_of_ban_killed()) { - if (wait_for_pidfile() == false) - { - Error << "Pidfile was not found:" << pid_file() << " :" << running(); - return -1; - } + return false; } -#endif - memcached_return_t rc; - bool ret; + SimpleClient client(_hostname, _port); - if (has_socket()) - { - ret= libmemcached_util_ping(socket().c_str(), 0, &rc); - } - else - { - ret= libmemcached_util_ping(hostname().c_str(), port(), &rc); - } - - if (memcached_failed(rc) or ret == false) - { - error(memcached_strerror(NULL, rc)); - } - - return ret; + std::string response; + return client.send_message("version", response); } const char *name() diff --git a/libtest/port.cc b/libtest/port.cc index 04d4bd14..3d48a09c 100644 --- a/libtest/port.cc +++ b/libtest/port.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/runner.cc b/libtest/runner.cc index 2d783697..5f1acf56 100644 --- a/libtest/runner.cc +++ b/libtest/runner.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include namespace libtest { diff --git a/libtest/server.cc b/libtest/server.cc index d58b362e..23ea8d74 100644 --- a/libtest/server.cc +++ b/libtest/server.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/server.h b/libtest/server.h index c4e7579c..f27ce08f 100644 --- a/libtest/server.h +++ b/libtest/server.h @@ -41,15 +41,8 @@ #include #include #include - -#ifdef HAVE_NETDB_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - +#include +#include #include #include #include diff --git a/libtest/server_container.cc b/libtest/server_container.cc index f87a9fba..79f0ad31 100644 --- a/libtest/server_container.cc +++ b/libtest/server_container.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/server_container.h b/libtest/server_container.h index 6eadc6d5..b8743033 100644 --- a/libtest/server_container.h +++ b/libtest/server_container.h @@ -39,7 +39,8 @@ #include #include #include - +#include +#include #include #include #include diff --git a/libtest/signal.cc b/libtest/signal.cc index 53a436be..e680ccbc 100644 --- a/libtest/signal.cc +++ b/libtest/signal.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include #include diff --git a/libtest/skiptest.cc b/libtest/skiptest.cc index dae33326..2a2ff222 100644 --- a/libtest/skiptest.cc +++ b/libtest/skiptest.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include diff --git a/libtest/socket.cc b/libtest/socket.cc index 7f7037f9..667a0219 100644 --- a/libtest/socket.cc +++ b/libtest/socket.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include static char global_socket[1024]= { 0 }; diff --git a/libtest/strerror.cc b/libtest/strerror.cc index 27d10365..39108d3c 100644 --- a/libtest/strerror.cc +++ b/libtest/strerror.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include namespace libtest { diff --git a/libtest/test.hpp b/libtest/test.hpp index 864552fb..7da55bd5 100644 --- a/libtest/test.hpp +++ b/libtest/test.hpp @@ -40,22 +40,7 @@ #include #include - -#if defined(WIN32) || defined(__MINGW32__) -# include -# include - -typedef short in_port_t; - -#endif - -#ifdef HAVE_ARPA_INET_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif +#include #include #include @@ -90,3 +75,4 @@ typedef short in_port_t; #include #include #include +#include diff --git a/libtest/timer.cc b/libtest/timer.cc index ffa8a4b6..b34cb4f9 100644 --- a/libtest/timer.cc +++ b/libtest/timer.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include diff --git a/libtest/timer.hpp b/libtest/timer.hpp index 73de26c6..28ec4741 100644 --- a/libtest/timer.hpp +++ b/libtest/timer.hpp @@ -114,9 +114,7 @@ public: private: void _time(struct timespec& ts) { -#if defined(HAVE_CLOCK_GETTIME) && HAVE_CLOCK_GETTIME - clock_gettime(CLOCK_REALTIME, &ts); -#elif defined(__MACH__) && __MACH__ // OSX lacks clock_gettime() +#ifdef __MACH__ // OSX lacks clock_gettime() clock_serv_t _clock_serv; mach_timespec_t _mach_timespec; host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &_clock_serv); @@ -125,6 +123,7 @@ private: ts.tv_sec= _mach_timespec.tv_sec; ts.tv_nsec= _mach_timespec.tv_nsec; #else + clock_gettime(CLOCK_REALTIME, &ts); #endif } diff --git a/libtest/tmpfile.cc b/libtest/tmpfile.cc index a576a4a1..d2457e2b 100644 --- a/libtest/tmpfile.cc +++ b/libtest/tmpfile.cc @@ -34,7 +34,6 @@ * */ -#include "config.h" #include namespace libtest { diff --git a/libtest/unittest.cc b/libtest/unittest.cc index 0af3e30f..21081141 100644 --- a/libtest/unittest.cc +++ b/libtest/unittest.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include diff --git a/libtest/vchar.cc b/libtest/vchar.cc index 24238060..1473509f 100644 --- a/libtest/vchar.cc +++ b/libtest/vchar.cc @@ -34,7 +34,7 @@ * */ -#include +#include "mem_config.h" #include namespace libtest { diff --git a/libtest/wait.cc b/libtest/wait.cc index a0d60d1f..a946d246 100644 --- a/libtest/wait.cc +++ b/libtest/wait.cc @@ -34,7 +34,7 @@ * */ -#include "config.h" +#include "mem_config.h" #include #include diff --git a/tests/cpp_example.cc b/tests/cpp_example.cc index f84af759..c490ac2d 100644 --- a/tests/cpp_example.cc +++ b/tests/cpp_example.cc @@ -1,7 +1,7 @@ /* * An example file showing the usage of the C++ libmemcached interface. */ -#include +#include #include #include diff --git a/tests/cycle.cc b/tests/cycle.cc index 2ec42463..a8ddc8a6 100644 --- a/tests/cycle.cc +++ b/tests/cycle.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include using namespace libtest; diff --git a/tests/failure.cc b/tests/failure.cc index b03a0433..abba57ed 100644 --- a/tests/failure.cc +++ b/tests/failure.cc @@ -34,7 +34,7 @@ * */ -#include +#include /* C++ interface test diff --git a/tests/hash_plus.cc b/tests/hash_plus.cc index 257a42ec..1fb2ef2a 100644 --- a/tests/hash_plus.cc +++ b/tests/hash_plus.cc @@ -2,7 +2,7 @@ C++ to libhashkit */ -#include +#include #include diff --git a/tests/hashkit_functions.cc b/tests/hashkit_functions.cc index b45be3ae..1e9ec7bd 100644 --- a/tests/hashkit_functions.cc +++ b/tests/hashkit_functions.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include using namespace libtest; diff --git a/tests/libmemcached-1.0/all_tests.cc b/tests/libmemcached-1.0/all_tests.cc index aaa89c0a..a471d89a 100644 --- a/tests/libmemcached-1.0/all_tests.cc +++ b/tests/libmemcached-1.0/all_tests.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include "tests/basic.h" diff --git a/tests/libmemcached-1.0/all_tests_socket.cc b/tests/libmemcached-1.0/all_tests_socket.cc index 47ab67eb..8321754d 100644 --- a/tests/libmemcached-1.0/all_tests_socket.cc +++ b/tests/libmemcached-1.0/all_tests_socket.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include "tests/basic.h" diff --git a/tests/libmemcached-1.0/atomsmasher.cc b/tests/libmemcached-1.0/atomsmasher.cc index 9b246b17..6dbd6d8c 100644 --- a/tests/libmemcached-1.0/atomsmasher.cc +++ b/tests/libmemcached-1.0/atomsmasher.cc @@ -12,7 +12,7 @@ /* Sample test application. */ -#include +#include #include diff --git a/tests/libmemcached-1.0/basic.cc b/tests/libmemcached-1.0/basic.cc index 392c6778..715490dc 100644 --- a/tests/libmemcached-1.0/basic.cc +++ b/tests/libmemcached-1.0/basic.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/callback_counter.cc b/tests/libmemcached-1.0/callback_counter.cc index 76b08814..468ae846 100644 --- a/tests/libmemcached-1.0/callback_counter.cc +++ b/tests/libmemcached-1.0/callback_counter.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include "tests/libmemcached-1.0/callback_counter.h" diff --git a/tests/libmemcached-1.0/callbacks.cc b/tests/libmemcached-1.0/callbacks.cc index 72b2f974..13d1b468 100644 --- a/tests/libmemcached-1.0/callbacks.cc +++ b/tests/libmemcached-1.0/callbacks.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/debug.cc b/tests/libmemcached-1.0/debug.cc index 6808089a..6beccc85 100644 --- a/tests/libmemcached-1.0/debug.cc +++ b/tests/libmemcached-1.0/debug.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/deprecated.cc b/tests/libmemcached-1.0/deprecated.cc index c5096ff7..891a4c94 100644 --- a/tests/libmemcached-1.0/deprecated.cc +++ b/tests/libmemcached-1.0/deprecated.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/dump.cc b/tests/libmemcached-1.0/dump.cc index 27583ead..107828d4 100644 --- a/tests/libmemcached-1.0/dump.cc +++ b/tests/libmemcached-1.0/dump.cc @@ -34,7 +34,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/encoding_key.cc b/tests/libmemcached-1.0/encoding_key.cc index 8d3e0dbc..24707582 100644 --- a/tests/libmemcached-1.0/encoding_key.cc +++ b/tests/libmemcached-1.0/encoding_key.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/error_conditions.cc b/tests/libmemcached-1.0/error_conditions.cc index b5a05c77..584f4c69 100644 --- a/tests/libmemcached-1.0/error_conditions.cc +++ b/tests/libmemcached-1.0/error_conditions.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #define BUILDING_LIBMEMCACHED diff --git a/tests/libmemcached-1.0/exist.cc b/tests/libmemcached-1.0/exist.cc index 7d1178ff..37495b0a 100644 --- a/tests/libmemcached-1.0/exist.cc +++ b/tests/libmemcached-1.0/exist.cc @@ -34,7 +34,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/fetch_all_results.cc b/tests/libmemcached-1.0/fetch_all_results.cc index 2ce4dc2f..aaad9edd 100644 --- a/tests/libmemcached-1.0/fetch_all_results.cc +++ b/tests/libmemcached-1.0/fetch_all_results.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/generate.cc b/tests/libmemcached-1.0/generate.cc index 37f4a36e..f14d2bf7 100644 --- a/tests/libmemcached-1.0/generate.cc +++ b/tests/libmemcached-1.0/generate.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/haldenbrand.cc b/tests/libmemcached-1.0/haldenbrand.cc index a48b346a..cdc476ab 100644 --- a/tests/libmemcached-1.0/haldenbrand.cc +++ b/tests/libmemcached-1.0/haldenbrand.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include "tests/libmemcached-1.0/haldenbrand.h" diff --git a/tests/libmemcached-1.0/internals.cc b/tests/libmemcached-1.0/internals.cc index 89d51413..7aff7db8 100644 --- a/tests/libmemcached-1.0/internals.cc +++ b/tests/libmemcached-1.0/internals.cc @@ -34,7 +34,7 @@ * */ -#include +#include #include using namespace libtest; diff --git a/tests/libmemcached-1.0/ketama.cc b/tests/libmemcached-1.0/ketama.cc index de8ac905..2fd726a6 100644 --- a/tests/libmemcached-1.0/ketama.cc +++ b/tests/libmemcached-1.0/ketama.cc @@ -34,7 +34,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc index 75b2ba90..3884ac52 100644 --- a/tests/libmemcached-1.0/mem_functions.cc +++ b/tests/libmemcached-1.0/mem_functions.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #if defined(HAVE_LIBUUID) && HAVE_LIBUUID diff --git a/tests/libmemcached-1.0/memcached_fetch_execute.cc b/tests/libmemcached-1.0/memcached_fetch_execute.cc index a22393f8..c74d2ec9 100644 --- a/tests/libmemcached-1.0/memcached_fetch_execute.cc +++ b/tests/libmemcached-1.0/memcached_fetch_execute.cc @@ -34,7 +34,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/memcached_get.cc b/tests/libmemcached-1.0/memcached_get.cc index 1db1a7e3..dc046544 100644 --- a/tests/libmemcached-1.0/memcached_get.cc +++ b/tests/libmemcached-1.0/memcached_get.cc @@ -34,7 +34,7 @@ * */ -#include +#include #include /* diff --git a/tests/libmemcached-1.0/namespace.cc b/tests/libmemcached-1.0/namespace.cc index cbe4d1b8..a1c362a9 100644 --- a/tests/libmemcached-1.0/namespace.cc +++ b/tests/libmemcached-1.0/namespace.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include using namespace libtest; diff --git a/tests/libmemcached-1.0/parser.cc b/tests/libmemcached-1.0/parser.cc index 6a75a2dc..33f95c5a 100644 --- a/tests/libmemcached-1.0/parser.cc +++ b/tests/libmemcached-1.0/parser.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include using namespace libtest; diff --git a/tests/libmemcached-1.0/plus.cpp b/tests/libmemcached-1.0/plus.cpp index e7bfd836..34fe7f28 100644 --- a/tests/libmemcached-1.0/plus.cpp +++ b/tests/libmemcached-1.0/plus.cpp @@ -35,7 +35,7 @@ * */ -#include +#include /* C++ interface test diff --git a/tests/libmemcached-1.0/pool.cc b/tests/libmemcached-1.0/pool.cc index b6653139..2e008d39 100644 --- a/tests/libmemcached-1.0/pool.cc +++ b/tests/libmemcached-1.0/pool.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include using namespace libtest; diff --git a/tests/libmemcached-1.0/print.cc b/tests/libmemcached-1.0/print.cc index 11125493..161223de 100644 --- a/tests/libmemcached-1.0/print.cc +++ b/tests/libmemcached-1.0/print.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include using namespace libtest; diff --git a/tests/libmemcached-1.0/replication.cc b/tests/libmemcached-1.0/replication.cc index 2e1808ea..363eaadb 100644 --- a/tests/libmemcached-1.0/replication.cc +++ b/tests/libmemcached-1.0/replication.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include using namespace libtest; diff --git a/tests/libmemcached-1.0/sasl.cc b/tests/libmemcached-1.0/sasl.cc index 65ce0310..b85d3277 100644 --- a/tests/libmemcached-1.0/sasl.cc +++ b/tests/libmemcached-1.0/sasl.cc @@ -34,7 +34,7 @@ * */ -#include +#include #include using namespace libtest; diff --git a/tests/libmemcached-1.0/server_add.cc b/tests/libmemcached-1.0/server_add.cc index 8fd717c6..6539df06 100644 --- a/tests/libmemcached-1.0/server_add.cc +++ b/tests/libmemcached-1.0/server_add.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include using namespace libtest; diff --git a/tests/libmemcached-1.0/setup_and_teardowns.cc b/tests/libmemcached-1.0/setup_and_teardowns.cc index ad2126fa..6655cb57 100644 --- a/tests/libmemcached-1.0/setup_and_teardowns.cc +++ b/tests/libmemcached-1.0/setup_and_teardowns.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/stat.cc b/tests/libmemcached-1.0/stat.cc index 605c8baa..60318790 100644 --- a/tests/libmemcached-1.0/stat.cc +++ b/tests/libmemcached-1.0/stat.cc @@ -34,7 +34,7 @@ * */ -#include +#include #include #include diff --git a/tests/libmemcached-1.0/string.cc b/tests/libmemcached-1.0/string.cc index babe1bf2..25613d8f 100644 --- a/tests/libmemcached-1.0/string.cc +++ b/tests/libmemcached-1.0/string.cc @@ -38,7 +38,7 @@ // We let libmemcached/common.h define config since we are looking at // library internals. -#include +#include #include diff --git a/tests/libmemcached-1.0/touch.cc b/tests/libmemcached-1.0/touch.cc index 07f0096f..9bd562a2 100644 --- a/tests/libmemcached-1.0/touch.cc +++ b/tests/libmemcached-1.0/touch.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include using namespace libtest; diff --git a/tests/libmemcached-1.0/virtual_buckets.cc b/tests/libmemcached-1.0/virtual_buckets.cc index 5ed812fa..a50477c9 100644 --- a/tests/libmemcached-1.0/virtual_buckets.cc +++ b/tests/libmemcached-1.0/virtual_buckets.cc @@ -35,7 +35,7 @@ * */ -#include +#include #include using namespace libtest; diff --git a/tests/mem_udp.cc b/tests/mem_udp.cc index ed657bf4..6e282d55 100644 --- a/tests/mem_udp.cc +++ b/tests/mem_udp.cc @@ -40,7 +40,7 @@ Sample test application. */ -#include +#include #include using namespace libtest; diff --git a/tests/memcapable.cc b/tests/memcapable.cc index 09b47efa..d36db346 100644 --- a/tests/memcapable.cc +++ b/tests/memcapable.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include #include diff --git a/tests/memcat.cc b/tests/memcat.cc index ed606d1d..abbee9e7 100644 --- a/tests/memcat.cc +++ b/tests/memcat.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include #include diff --git a/tests/memcp.cc b/tests/memcp.cc index 3c8d6b02..ef5ef0fa 100644 --- a/tests/memcp.cc +++ b/tests/memcp.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include #include diff --git a/tests/memdump.cc b/tests/memdump.cc index e34d1b08..d702ef6a 100644 --- a/tests/memdump.cc +++ b/tests/memdump.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include #include diff --git a/tests/memerror.cc b/tests/memerror.cc index 9b3ddd35..42334017 100644 --- a/tests/memerror.cc +++ b/tests/memerror.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include #include diff --git a/tests/memexist.cc b/tests/memexist.cc index 47496a64..2c40b437 100644 --- a/tests/memexist.cc +++ b/tests/memexist.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include #include diff --git a/tests/memflush.cc b/tests/memflush.cc index 0f708a9b..3a3ac076 100644 --- a/tests/memflush.cc +++ b/tests/memflush.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include #include diff --git a/tests/memrm.cc b/tests/memrm.cc index 1f5f722a..6b2b0618 100644 --- a/tests/memrm.cc +++ b/tests/memrm.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include #include diff --git a/tests/memslap.cc b/tests/memslap.cc index 792d15fb..2fd6a75f 100644 --- a/tests/memslap.cc +++ b/tests/memslap.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include #include diff --git a/tests/memstat.cc b/tests/memstat.cc index b2dea7e9..86edee4f 100644 --- a/tests/memstat.cc +++ b/tests/memstat.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include #include diff --git a/tests/memtouch.cc b/tests/memtouch.cc index 207ac1dc..5293ce8e 100644 --- a/tests/memtouch.cc +++ b/tests/memtouch.cc @@ -39,7 +39,7 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include #include #include diff --git a/tests/parser.cc b/tests/parser.cc index 220d9ef5..a80c404a 100644 --- a/tests/parser.cc +++ b/tests/parser.cc @@ -34,7 +34,7 @@ * */ -#include +#include /* C++ interface test diff --git a/util/daemon.cc b/util/daemon.cc index 68393297..90e29efb 100644 --- a/util/daemon.cc +++ b/util/daemon.cc @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -#include +#include #if defined __SUNPRO_C || defined __DECC || defined __HP_cc # pragma ident "@(#)$Header: /cvsroot/wikipedia/willow/src/bin/willow/daemon.c,v 1.1 2005/05/02 19:15:21 kateturner Exp $" diff --git a/util/instance.cc b/util/instance.cc index 8b9f5ee9..a1665f36 100644 --- a/util/instance.cc +++ b/util/instance.cc @@ -36,7 +36,7 @@ */ -#include +#include #include "util/instance.hpp" diff --git a/util/operation.cc b/util/operation.cc index def31a6b..3b84a278 100644 --- a/util/operation.cc +++ b/util/operation.cc @@ -36,7 +36,7 @@ */ -#include +#include #include "util/operation.hpp" #include diff --git a/util/signal.cc b/util/signal.cc index 6eda5645..8e63016f 100644 --- a/util/signal.cc +++ b/util/signal.cc @@ -34,7 +34,7 @@ * */ -#include +#include #include #include -- 2.30.2