Added two test files to the tarball.

[m6w6/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index 2577e2f46f92f65ee24cdccc9a3d6998f0db80cd..eec83b70e73fa69da44bdfe1a5af4e1f8ac5daec 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -15,16 +15,18 @@ 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
+                                                tests/cpp_example.cc \
+                                                tests/output_plus.res \
+                                                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 \
@@ -112,12 +114,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 +165,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 +187,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 +195,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