X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=b34f1f165ae8c9e9c65bc505716b9d6782162bad;hb=b685ca2e84b65366bc9be5ec31fbde6c831a3837;hp=f1d00ef0f2636204fda7df1701505338734a9fcb;hpb=dac48f2dbe34915755f8f4f7f88419f47dc9e27f;p=m6w6%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index f1d00ef0..b34f1f16 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -37,10 +37,12 @@ noinst_HEADERS+= \
 noinst_PROGRAMS+= \
 		  tests/atomsmasher \
 		  tests/hashplus \
+		  tests/memplus \
 		  tests/startservers \
 		  tests/testapp \
 		  tests/testhashkit \
-		  tests/testplus
+		  tests/testplus \
+		  tests/testudp
 
 noinst_LTLIBRARIES+= tests/libserver.la
 tests_libserver_la_SOURCES= tests/server.c
@@ -51,11 +53,11 @@ tests_libtest_la_SOURCES= tests/test.c
 tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testapp_SOURCES= tests/mem_functions.c
 tests_testapp_LDADD= \
-	clients/libgenexec.la \
-	tests/libserver.la \
-	tests/libtest.la \
-	libmemcached/libmemcachedinternal.la \
-	$(TESTS_LDADDS)
+		     clients/libgenexec.la \
+		     tests/libserver.la \
+		     tests/libtest.la \
+		     libmemcached/libmemcachedinternal.la \
+$(TESTS_LDADDS)
 tests_testapp_DEPENDENCIES= $(tests_testapp_LDADD)
 
 tests_testplus_SOURCES= tests/plus.cpp
@@ -70,6 +72,15 @@ tests_atomsmasher_LDADD= \
 	$(TESTS_LDADDS)
 tests_atomsmasher_DEPENDENCIES= $(tests_atomsmasher_LDADD)
 
+tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+tests_testudp_SOURCES= tests/mem_udp.c
+tests_testudp_LDADD= \
+	clients/libgenexec.la \
+	tests/libserver.la \
+	tests/libtest.la \
+	$(TESTS_LDADDS)
+tests_testudp_DEPENDENCIES= $(tests_testudp_LDADD)
+
 tests_startservers_SOURCES= tests/start.c
 tests_startservers_LDADD= tests/libserver.la $(TESTS_LDADDS)
 tests_startservers_DEPENDENCIES= $(tests_startservers_LDADD)
@@ -82,6 +93,10 @@ tests_hashplus_SOURCES = tests/hash_plus.cc
 tests_hashplus_LDADD = $(tests_testhashkit_LDADD)
 tests_hashplus_DEPENDENCIES = $(tests_testhashkit_LDADD)
 
+tests_memplus_SOURCES = tests/mem_plus.cc
+tests_memplus_LDADD = tests/libtest.la tests/libserver.la libmemcached/libmemcached.la
+tests_memplus_DEPENDENCIES = $(tests_memplus_LDADD)
+
 test: test-docs test-mem test-hash memcapable
 	echo "Tests completed"
 
@@ -204,22 +219,29 @@ MEMSLAP_COMMAND= clients/memslap $(COLLECTION) $(SUITE)
 
 MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
 
-MEMPLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
+TESTPLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
+
+MEMPLUS_COMMAND= tests/memplus $(COLLECTION) $(SUITE)
 
 HASHPLUS_COMMAND= tests/hashplus $(COLLECTION) $(SUITE)
 
 ATOM_COMMAND= tests/atomsmasher $(COLLECTION) $(SUITE)
 
+UDP_COMMAND= tests/testudp $(COLLECTION) $(SUITE)
+
 HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE)
 
 test-mem: tests/testapp
 	$(MEM_COMMAND)
 
+test-udp: tests/testudp
+	$(UDP_COMMAND)
+
 test-atom: tests/atomsmasher
 	$(ATOM_COMMAND)
 
 test-plus: tests/testplus
-	$(MEMPLUS_COMMAND)
+	$(TESTPLUS_COMMAND)
 
 test-hash: tests/testhashkit
 	$(HASH_COMMAND)
@@ -227,6 +249,9 @@ test-hash: tests/testhashkit
 test-hashplus: tests/hashplus
 	$(HASHPLUS_COMMAND)
 
+test-memplus: tests/memplus
+	$(MEMPLUS_COMMAND)
+
 pahole-mem: tests/testapp
 	$(PAHOLE_COMMAND)  $(MEM_COMMAND)
 
@@ -234,10 +259,13 @@ gdb-mem: tests/testapp
 	$(DEBUG_COMMAND)  $(MEM_COMMAND)
 
 gdb-atom: tests/atomsmasher
+	$(DEBUG_COMMAND)  $(UDP_COMMAND)
+
+gdb-udp: tests/testudp
 	$(DEBUG_COMMAND)  $(ATOM_COMMAND)
 
 gdb-plus: tests/testplus
-	$(DEBUG_COMMAND)  $(MEMPLUS_COMMAND)
+	$(DEBUG_COMMAND)  $(TESTPLUS_COMMAND)
 
 gdb-hash: tests/testhashkit
 	$(DEBUG_COMMAND) $(HASH_COMMAND)
@@ -245,6 +273,9 @@ gdb-hash: tests/testhashkit
 gdb-hashplus: tests/hashplus
 	$(DEBUG_COMMAND) $(HASHPLUS_COMMAND)
 
+gdb-memplus: tests/memplus
+	$(DEBUG_COMMAND) $(MEMPLUS_COMMAND)
+
 gdb-memslap: clients/memslap
 	$(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
 
@@ -254,8 +285,11 @@ valgrind-mem: tests/testapp
 valgrind-atom: tests/atomsmasher
 	$(VALGRIND_COMMAND)  $(ATOM_COMMAND)
 
+valgrind-udp: tests/testudp
+	$(VALGRIND_COMMAND)  $(UDP_COMMAND)
+
 valgrind-plus: tests/testplus
-	$(VALGRIND_COMMAND)  $(MEMPLUS_COMMAND)
+	$(VALGRIND_COMMAND)  $(TESTPLUS_COMMAND)
 
 valgrind-hash: tests/testhashkit
 	$(VALGRIND_COMMAND) $(HASH_COMMAND)
@@ -263,6 +297,9 @@ valgrind-hash: tests/testhashkit
 valgrind-hashplus: tests/hashplus
 	$(VALGRIND_COMMAND) $(HASHPLUS_COMMAND)
 
+valgrind-memplus: tests/memplus
+	$(VALGRIND_COMMAND) $(MEMPLUS_COMMAND)
+
 valgrind-memslap: clients/memslap
 	$(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)