From 7665f0a79abd7144393fec87c87bc406904dcfc6 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Thu, 2 Jun 2011 12:48:43 -0700 Subject: [PATCH] Merge in m4 to not build memaslap by default. --- clients/include.am | 30 ++++++++++++++++-------------- configure.ac | 1 + m4/memaslap.m4 | 9 +++++++++ 3 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 m4/memaslap.m4 diff --git a/clients/include.am b/clients/include.am index a744cf78..281aa0b9 100644 --- a/clients/include.am +++ b/clients/include.am @@ -23,11 +23,13 @@ bin_PROGRAMS+= \ clients/memslap \ clients/memstat +if BUILD_MEMASLAP if HAVE_LIBEVENT if !BUILD_WIN32_WRAPPERS bin_PROGRAMS+= clients/memaslap endif endif +endif noinst_HEADERS+= \ clients/client_options.h \ @@ -96,19 +98,19 @@ test-start-server: clients/memcat --servers=localhost /etc/services clients/memrm --servers=localhost /etc/services clients/memstat --servers=localhost - clients/memaslap --servers=localhost - clients/memaslap --servers=localhost --concurrency=10 - clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 - clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 - clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get - clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set - clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking + clients/memslap --servers=localhost + clients/memslap --servers=localhost --concurrency=10 + clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 + clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 + clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get + clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set + clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking client-valgrind: - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memaslap --servers=localhost - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memaslap --servers=localhost --concurrency=10 - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking + libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost + libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost --concurrency=10 + libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 + libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 + libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get + libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set + libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking diff --git a/configure.ac b/configure.ac index 9b8a82c5..d6af0f95 100644 --- a/configure.ac +++ b/configure.ac @@ -115,6 +115,7 @@ ENABLE_UTILLIB SETSOCKOPT_SANITY ENABLE_HSIEH_HASH ENABLE_MURMUR_HASH +ENABLE_MEMASLAP PROTOCOL_BINARY_TEST WITH_MEMCACHED ENABLE_DEPRECATED diff --git a/m4/memaslap.m4 b/m4/memaslap.m4 new file mode 100644 index 00000000..6c9a9321 --- /dev/null +++ b/m4/memaslap.m4 @@ -0,0 +1,9 @@ +AC_DEFUN([ENABLE_MEMASLAP], + [AC_ARG_ENABLE([memaslap], + [AS_HELP_STRING([--enable-memaslap], + [build with memaslap tool. @<:@default=off@:>@])], + [ac_cv_enable_memaslap=yes], + [ac_cv_enable_memaslap=no]) + + AM_CONDITIONAL([BUILD_MEMASLAP], [test "$ac_cv_enable_memaslap" = "yes"]) +]) -- 2.30.2