projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Added simple exception test to the C++ test case file.
[m6w6/libmemcached]
/
tests
/
Makefile.am
diff --git
a/tests/Makefile.am
b/tests/Makefile.am
index 70437c2ed3e26763110ef36381cead2ef45e3fd2..5cc1f82e4e2cbc4995a259f5bc46c655e4ad3135 100644
(file)
--- a/
tests/Makefile.am
+++ b/
tests/Makefile.am
@@
-20,25
+20,30
@@
LIBS =
noinst_HEADERS = test.h server.h ketama_test_cases.h
noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
noinst_HEADERS = test.h server.h ketama_test_cases.h
noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
+noinst_LTLIBRARIES= libserver.la libtest.la
-testapp_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
-testapp_SOURCES = test.c function.c server.c ../clients/generator.c ../clients/execute.c
-testapp_LDADD = $(LDADDS)
+libserver_la_SOURCES= server.c
+libtest_la_SOURCES= test.c
-testplus_SOURCES = test.c plus.cpp server.c
-testplus_LDADD = $(LDADDS)
+testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+testapp_SOURCES = function.c
+testapp_LDADD = $(LDADDS) $(top_builddir)/clients/libgenexec.la libtest.la libserver.la
-udptest_SOURCES = test.c udp.c server.c
-udptest_LDADD = $(LDADDS)
+testplus_SOURCES = plus.cpp
+testplus_LDADD = $(LDADDS) libtest.la libserver.la
-
atomsmasher_SOURCES = test.c atomsmasher.c server.c ../clients/generator.c ../clients/execute
.c
-atomsmasher_LDADD = $(LDADDS)
+
udptest_SOURCES = udp
.c
+udptest_LDADD = $(LDADDS) libtest.la libserver.la
-startservers_SOURCES = start.c server.c
-startservers_LDADD = $(LDADDS)
+atomsmasher_SOURCES = atomsmasher.c
+atomsmasher_LDADD = $(LDADDS) $(top_builddir)/clients/libgenexec.la libtest.la libserver.la
+
+startservers_SOURCES = start.c
+startservers_LDADD = $(LDADDS) libserver.la
record:
./testapp > output.res
record:
./testapp > output.res
+ ./testplus > output_plus.res
client-record:
sh t/memcat.test > r/memcat.res
client-record:
sh t/memcat.test > r/memcat.res
@@
-50,12
+55,14
@@
client-record:
record-extended:
./testapp extended > output2.res
record-extended:
./testapp extended > output2.res
-test: testapp library_test
+test: testapp
testplus
library_test
echo "Tests completed"
library_test:
./testapp > output.cmp
diff output.res output.cmp
echo "Tests completed"
library_test:
./testapp > output.cmp
diff output.res output.cmp
+# ./testplus > output_plus.cmp
+# diff output_plus.res output_plus.cmp
clients:
memcached -d -P /tmp/Xumemc.pid -p 12555
clients:
memcached -d -P /tmp/Xumemc.pid -p 12555
@@
-91,7
+98,7
@@
helgrind:
libtool --mode=execute valgrind --tool=helgrind testapp
helgrind-slap:
libtool --mode=execute valgrind --tool=helgrind testapp
helgrind-slap:
- libtool --mode=execute valgrind --tool=helgrind
..
/clients/memslap --server=localhost --concurrency=30
+ libtool --mode=execute valgrind --tool=helgrind
${top_builddir}
/clients/memslap --server=localhost --concurrency=30
test-no-outputdiff: testapp
./testapp > /dev/null
test-no-outputdiff: testapp
./testapp > /dev/null