Use bool instead of bool:1 if your compiler doesn't create correct code

[awesomized/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index db6f23f6cb70da8db486bd35d92bbeb19a9f1d10..6404153555c77b434ec21bf3b773b288d46c536a 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -8,6 +8,8 @@ VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-rea
 
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 
+PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
+
 if BUILD_LIBMEMCACHEDUTIL
 TESTS_LDADDS+= libmemcached/libmemcachedutil.la
 endif
@@ -34,6 +36,8 @@ noinst_HEADERS+= \
 
 noinst_PROGRAMS+= \
                  tests/atomsmasher \
+                 tests/hashplus \
+                 tests/memplus \
                  tests/startservers \
                  tests/testapp \
                  tests/testhashkit \
@@ -48,11 +52,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
@@ -75,7 +79,18 @@ tests_testhashkit_SOURCES = tests/hashkit_functions.c
 tests_testhashkit_LDADD = tests/libtest.la libhashkit/libhashkit.la
 tests_testhashkit_DEPENDENCIES = $(tests_testhashkit_LDADD)
 
-test: test-docs test-plus test-mem test-hash memcapable test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
+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"
+
+test-x: test-docs test-plus test-mem test-hash memcapable test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
        echo "Tests completed"
 
 memcapable: clients/memcapable
@@ -194,7 +209,11 @@ MEMSLAP_COMMAND= clients/memslap $(COLLECTION) $(SUITE)
 
 MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
 
-PLUS_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)
 
@@ -207,11 +226,20 @@ test-atom: tests/atomsmasher
        $(ATOM_COMMAND)
 
 test-plus: tests/testplus
-       $(PLUS_COMMAND)
+       $(TESTPLUS_COMMAND)
 
 test-hash: tests/testhashkit
        $(HASH_COMMAND)
 
+test-hashplus: tests/hashplus
+       $(HASHPLUS_COMMAND)
+
+test-memplus: tests/memplus
+       $(MEMPLUS_COMMAND)
+
+pahole-mem: tests/testapp
+       $(PAHOLE_COMMAND)  $(MEM_COMMAND)
+
 gdb-mem: tests/testapp
        $(DEBUG_COMMAND)  $(MEM_COMMAND)
 
@@ -219,11 +247,17 @@ gdb-atom: tests/atomsmasher
        $(DEBUG_COMMAND)  $(ATOM_COMMAND)
 
 gdb-plus: tests/testplus
-       $(DEBUG_COMMAND)  $(PLUS_COMMAND)
+       $(DEBUG_COMMAND)  $(TESTPLUS_COMMAND)
 
 gdb-hash: tests/testhashkit
        $(DEBUG_COMMAND) $(HASH_COMMAND)
 
+gdb-hashplus: tests/hashplus
+       $(DEBUG_COMMAND) $(HASHPLUS_COMMAND)
+
+gdb-memplus: tests/memplus
+       $(DEBUG_COMMAND) $(MEMPLUS_COMMAND)
+
 gdb-memslap: clients/memslap
        $(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
 
@@ -234,11 +268,17 @@ valgrind-atom: tests/atomsmasher
        $(VALGRIND_COMMAND)  $(ATOM_COMMAND)
 
 valgrind-plus: tests/testplus
-       $(VALGRIND_COMMAND)  $(PLUS_COMMAND)
+       $(VALGRIND_COMMAND)  $(TESTPLUS_COMMAND)
 
 valgrind-hash: tests/testhashkit
        $(VALGRIND_COMMAND) $(HASH_COMMAND)
 
+valgrind-hashplus: tests/hashplus
+       $(VALGRIND_COMMAND) $(HASHPLUS_COMMAND)
+
+valgrind-memplus: tests/memplus
+       $(VALGRIND_COMMAND) $(MEMPLUS_COMMAND)
+
 valgrind-memslap: clients/memslap
        $(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)