@@ -1,19 +1,19 @@ -bin_PROGRAMS = memcached +bin_PROGRAMS = memcached memcached-debug -memcached_SOURCES = memcached.c slabs.c items.c memcached.h assoc.c +memcached_SOURCES = memcached.c slabs.c items.c assoc.c +memcached_debug_SOURCES = $(memcached_SOURCES) +memcached_CPPFLAGS = -DNDEBUG memcached_LDADD = @LIBOBJS@ +memcached_debug_LDADD = $(memcached_LDADD) SUBDIRS = doc DIST_DIRS = scripts EXTRA_DIST = doc scripts TODO t -test: memcached - prove t +memcached.c: memcached.h -# Uncomment the following to save some CPU (by disabling assertions), at the risk of silent data -# structure corruption. After all, this is a new branch of memcached, so you probably want -# assertions enabled. -#AM_CFLAGS=-DNDEBUG +test: memcached-debug + prove t dist-hook: rm -rf $(distdir)/doc/.svn/ Makefile.am @@ -17,3 +17,8 @@ Bug reports, patches, testing, help: Michael Johnson <ahze@ahze.net> Paul Querna <chip@corelands.com> Jamie McCarthy <jamie@mccarthy.vg> + Philip Neustrom <philipn@gmail.com> + Andrew O'Brien <andrewo@oriel.com.au> + Josh Rotenberg <joshrotenberg@gmail.com> + Robin H. Johnson <robbat2@gentoo.org> -- automake foo + doc/CONTRIBUTORS.txt @@ -79,7 +79,7 @@ sub new_memcached { } my $childpid = fork(); - my $exe = "$Bin/../memcached"; + my $exe = "$Bin/../memcached-debug"; croak("memcached binary doesn't exist. Haven't run 'make' ?\n") unless -e $exe; croak("memcached binary not executable\n") unless -x _; t/lib/MemcachedTest.pm 217b0f79d8741405e4c89d7f5e1429ae3d57c70f Brad Fitzpatrick brad@danga.com http://github.com/dustin/memcached/commit/e971149ac8a41b54fe330b72f6cb9641caf18485 e971149ac8a41b54fe330b72f6cb9641caf18485 2006-09-05T19:44:13-07:00 2006-09-05T19:44:13-07:00 automake foo from Robin H. Johnson: build two targets, and test on the debug one with asserts git-svn-id: http://code.sixapart.com/svn/memcached/trunk/server@375 b0b603af-a30f-0410-a34e-baf09ae79d0b 93c600209727e9693efdfd12661fc21aeafa0414 Brad Fitzpatrick brad@danga.com