projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
A few 32-bit fixes.
[m6w6/libmemcached]
/
tests
/
Makefile.am
diff --git
a/tests/Makefile.am
b/tests/Makefile.am
index f23fde0b9a054c8f44081e1a3d6ba1b80d4f7e85..cb0bc2a0f32b0e09eb829156232c1b662a087553 100644
(file)
--- a/
tests/Makefile.am
+++ b/
tests/Makefile.am
@@
-1,5
+1,8
@@
-INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/lib
-LDADDS = ../lib/libmemcached.la
+LDADDS = $(top_builddir)/libmemcached/libmemcached.la
+
+if BUILD_LIBMEMCACHEDUTIL
+LDADDS+= $(top_builddir)/libmemcachedutil/libmemcachedutil.la
+endif
EXTRA_DIST = output.res output2.res\
r/memcat.res\
EXTRA_DIST = output.res output2.res\
r/memcat.res\
@@
-15,10
+18,10
@@
EXTRA_DIST = output.res output2.res\
LIBS =
LIBS =
-noinst_HEADERS = test.h server.h
+noinst_HEADERS = test.h server.h
ketama_test_cases.h
noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
-testapp_SOURCES = test.c function.c
../src/generator.c ../src/execute.c server
.c
+testapp_SOURCES = test.c function.c
server.c ../clients/generator.c ../clients/execute
.c
testapp_LDADD = $(LDADDS)
testplus_SOURCES = test.c plus.cpp server.c
testapp_LDADD = $(LDADDS)
testplus_SOURCES = test.c plus.cpp server.c
@@
-27,7
+30,7
@@
testplus_LDADD = $(LDADDS)
udptest_SOURCES = test.c udp.c server.c
udptest_LDADD = $(LDADDS)
udptest_SOURCES = test.c udp.c server.c
udptest_LDADD = $(LDADDS)
-atomsmasher_SOURCES = test.c atomsmasher.c server.c ../
src/generator.c ../src
/execute.c
+atomsmasher_SOURCES = test.c atomsmasher.c server.c ../
clients/generator.c ../clients
/execute.c
atomsmasher_LDADD = $(LDADDS)
startservers_SOURCES = start.c server.c
atomsmasher_LDADD = $(LDADDS)
startservers_SOURCES = start.c server.c
@@
-71,3
+74,7
@@
clients:
valgrind:
libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes testapp
valgrind:
libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes testapp
+
+test-no-outputdiff: testapp
+ ./testapp > /dev/null
+ @echo "Test completed"