Skip to content

Commit

Permalink
automake foo from Robin H. Johnson: build two targets, and test on th…
Browse files Browse the repository at this point in the history
…e debug one with asserts

git-svn-id: http://code.sixapart.com/svn/memcached/trunk/server@375 b0b603af-a30f-0410-a34e-baf09ae79d0b
  • Loading branch information
bradfitz committed Sep 6, 2006
1 parent 217b0f7 commit e971149
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
16 changes: 8 additions & 8 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
5 changes: 5 additions & 0 deletions doc/CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@ Bug reports, patches, testing, help:
Michael Johnson <[email protected]>
Paul Querna <[email protected]>
Jamie McCarthy <[email protected]>
Philip Neustrom <[email protected]>
Andrew O'Brien <[email protected]>
Josh Rotenberg <[email protected]>
Robin H. Johnson <[email protected]> -- automake foo

2 changes: 1 addition & 1 deletion t/lib/MemcachedTest.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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 _;

Expand Down

0 comments on commit e971149

Please sign in to comment.