projects / awesomized / libmemcached / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree | github
raw | inline | side by side
Updating from Monty
[awesomized/libmemcached] / tests / include.am
diff --git a/tests/include.am b/tests/include.am
index 2577e2f46f92f65ee24cdccc9a3d6998f0db80cd..593c98fa9e6fa802fdfe3724354fcd0beee14ea5 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -4,7 +4,7 @@
 
 TESTS_LDADDS = libmemcached/libmemcached.la
 
-VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes
+VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --track-fds=yes
 
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 
@@ -14,18 +14,6 @@ if BUILD_LIBMEMCACHEDUTIL
 TESTS_LDADDS+= libmemcached/libmemcachedutil.la
 endif
 
-EXTRA_DIST+= \
-            tests/r/memcat.res \
-            tests/r/memcp.res \
-            tests/r/memrm.res \
-            tests/r/memslap.res \
-            tests/r/memstat.res \
-            tests/t/memcat.test \
-            tests/t/memcp.test \
-            tests/t/memrm.test \
-            tests/t/memslap.test \
-            tests/t/memstat.test
-
 noinst_HEADERS+= \
                 tests/hash_results.h \
                 tests/ketama_test_cases.h \
@@ -53,32 +41,34 @@ 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_DEPENDENCIES= \
-                    clients/libgenexec.la \
-                    tests/libserver.la \
-                    tests/libtest.la \
-                    libmemcached/libmemcachedinternal.la \
-                     $(TESTS_LDADDS)
+                           $(BUILT_SOURCES) \
+                           clients/libgenexec.la \
+                           tests/libserver.la \
+                           tests/libtest.la \
+                           libmemcached/libmemcachedinternal.la \
+                           $(TESTS_LDADDS)
 tests_testapp_LDADD= $(tests_testapp_DEPENDENCIES) $(LIBSASL)
 
 tests_testplus_SOURCES= tests/plus.cpp
+tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
 tests_testplus_DEPENDENCIES= tests/libtest.la tests/libserver.la $(TESTS_LDADDS)
 tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) $(LIBSASL)
 
 tests_atomsmasher_SOURCES= tests/atomsmasher.c
 tests_atomsmasher_DEPENDENCIES= \
-       clients/libgenexec.la \
-       tests/libserver.la \
-       tests/libtest.la \
-       $(TESTS_LDADDS)
+                               clients/libgenexec.la \
+                               tests/libserver.la \
+                               tests/libtest.la \
+                               $(TESTS_LDADDS)
 tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) $(LIBSASL)
 
 tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testudp_SOURCES= tests/mem_udp.c
 tests_testudp_DEPENDENCIES= \
-       clients/libgenexec.la \
-       tests/libserver.la \
-       tests/libtest.la \
-       $(TESTS_LDADDS)
+                           clients/libgenexec.la \
+                           tests/libserver.la \
+                           tests/libtest.la \
+                           $(TESTS_LDADDS)
 tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL)
 
 tests_startservers_SOURCES= tests/start.c
@@ -90,17 +80,21 @@ tests_testhashkit_DEPENDENCIES = tests/libtest.la libhashkit/libhashkit.la
 tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
 
 tests_hashplus_SOURCES = tests/hash_plus.cc
+tests_hashplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
 tests_hashplus_DEPENDENCIES = $(tests_testhashkit_DEPENDENCIES)
 tests_hashplus_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
 
 tests_memplus_SOURCES = tests/mem_plus.cc
+tests_memplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
 tests_memplus_DEPENDENCIES = tests/libtest.la tests/libserver.la libmemcached/libmemcached.la
 tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES)
 
-test: test-docs test-mem test-hash memcapable
+test: check
+
+check-local: 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
+test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
        echo "Tests completed"
 
 memcapable: clients/memcapable
@@ -112,12 +106,14 @@ memcapable: clients/memcapable
 test-memcat: clients/memcat clients/memcp
        @echo "Testing memcat"
        @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
-       @clients/memcp --servers="localhost:12555" clients/memcp
-       @clients/memcat --servers="localhost:12555" memcp > tests/scratch
+       @clients/memcp --servers="localhost:12555" `pwd`/clients/memcp
+       @clients/memcat --servers="localhost:12555" memcp > `pwd`/tests/scratch
+       @clients/memcat --servers="localhost:12555" --file=`pwd`/tests/scratch2 memcp
 #      @diff clients/memcp tests/scratch
-       @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
-       @rm tests/Xumemc.pid
-       @rm tests/scratch
+       @cat `pwd`/tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+       @rm `pwd`/tests/Xumemc.pid
+       @rm `pwd`/tests/scratch
+       @rm `pwd`/tests/scratch2
 
 valgrind-memcat: clients/memcat clients/memcp
        @echo "Testing memcat"
@@ -161,21 +157,21 @@ valgrind-memrm: clients/memcat clients/memcp
 
 test-memflush: clients/memflush
        @echo "Testing memflush"
-       @/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memflush --servers="localhost:12555"
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
        @rm tests/Xumemc.pid
 
 valgrind-memflush: clients/memflush
        @echo "Testing memflush"
-       @/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
        @$(VALGRIND_COMMAND) clients/memflush --servers="localhost:12555"
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
        @rm tests/Xumemc.pid
 
 test-memdump: clients/memdump clients/memcp
        @echo "Testing memdump"
-       @/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memcp --servers="localhost:12555" clients/memcat
        @clients/memdump --servers="localhost:12555" > /dev/null
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
@@ -183,7 +179,7 @@ test-memdump: clients/memdump clients/memcp
 
 valgrind-memdump: clients/memcat clients/memcp
        @echo "Testing memdump"
-       @/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memcp --servers="localhost:12555" clients/memcat
        @$(VALGRIND_COMMAND) clients/memdump --servers="localhost:12555" > /dev/null
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
@@ -191,14 +187,14 @@ valgrind-memdump: clients/memcat clients/memcp
 
 test-memstat: clients/memstat
        @echo "Testing memstat"
-       @/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memstat --servers="localhost:12555" > /dev/null
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
        @rm tests/Xumemc.pid
 
 valgrind-memstat: clients/memstat
        @echo "Testing memstat"
-       @/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
        @$(VALGRIND_COMMAND) clients/memstat --servers="localhost:12555" > /dev/null
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
        @rm tests/Xumemc.pid
Resurrection of libmemcached