tests: fix clients tests

diff --git a/Makefile.am b/Makefile.am
index e8a4121c8a08dd0ff3038f1891c52f4102836f95..789e6dcffcbb1c939eb101c794237affddb65364 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,9 +87,7 @@ include win32/include.am
 include m4/include.am
 endif
 
-TESTS += ${bin_PROGRAMS}
 TESTS += ${check_PROGRAMS}
-XFAIL_TESTS += ${bin_PROGRAMS}
 
 if ! BUILD_WIN32
 

diff --git a/clients/include.am b/clients/include.am
index 41328568ff76fe1906ecd2191bcf92b29b8f1e34..b6b2fd50544714c0b2daa308c018091e318e9100 100644 (file)
--- a/clients/include.am
+++ b/clients/include.am
@@ -104,6 +104,23 @@ clients_memcapable_SOURCES+= libmemcached/byteorder.cc
 clients_memcapable_LDADD= $(CLIENTS_LDADDS)
 clients_memcapable_LDADD+= @PTHREAD_LIBS@
 
+TESTS += clients/memcapable.sh
+TESTS += clients/memcp.sh
+TESTS += clients/memcat.sh
+clients/memcat.sh: | mem.testdata
+mem.testdata:
+       date > $@
+TESTS += clients/memdump.sh
+TESTS += clients/memerror.sh
+TESTS += clients/memexist.sh
+TESTS += clients/memparse.sh
+TESTS += clients/memping.sh
+TESTS += clients/memrm.sh
+TESTS += clients/memslap.sh
+TESTS += clients/memstat.sh
+TESTS += clients/memtouch.sh
+TESTS += clients/memflush.sh
+
 test-start-server:
        clients/memflush --servers=localhost
        clients/memcp --servers=localhost /etc/services

diff --git a/clients/memcapable.sh b/clients/memcapable.sh
new file mode 100755 (executable)
index 0000000..cc4f89a
--- /dev/null
+++ b/clients/memcapable.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+clients/memcapable -vh localhost

diff --git a/clients/memcat.cc b/clients/memcat.cc
index 52b02aca3a427d6f648414cc0dc2caae0e8d9cca..911c47616fcba641b798b8535884144cacb907d4 100644 (file)
--- a/clients/memcat.cc
+++ b/clients/memcat.cc
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
       {
         if (opt_verbose)
         {
-          std::cout << "key: " << argv[optind] << std::endl << "flags: " << flags << "length: " << string_length << std::endl << "value: ";
+          std::cout << "key: " << argv[optind] << std::endl << "flags: " << flags << std::endl << "length: " << string_length << std::endl << "value: ";
         }
 
         if (opt_file)

diff --git a/clients/memcat.sh b/clients/memcat.sh
new file mode 100755 (executable)
index 0000000..ac05790
--- /dev/null
+++ b/clients/memcat.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+clients/memcat --servers=localhost -v mem.testdata

diff --git a/clients/memcp.sh b/clients/memcp.sh
new file mode 100755 (executable)
index 0000000..a2f7d53
--- /dev/null
+++ b/clients/memcp.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+clients/memcp -v --servers localhost mem.testdata

diff --git a/clients/memdump.sh b/clients/memdump.sh
new file mode 100755 (executable)
index 0000000..6e131d2
--- /dev/null
+++ b/clients/memdump.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+clients/memdump -v --servers localhost

diff --git a/clients/memerror.sh b/clients/memerror.sh
new file mode 100755 (executable)
index 0000000..3843b55
--- /dev/null
+++ b/clients/memerror.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+clients/memerror 0 1 2 3

diff --git a/clients/memexist.sh b/clients/memexist.sh
new file mode 100755 (executable)
index 0000000..5aa0287
--- /dev/null
+++ b/clients/memexist.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+clients/memexist -v --servers localhost mem.testdata

diff --git a/clients/memflush.sh b/clients/memflush.sh
new file mode 100755 (executable)
index 0000000..f841e70
--- /dev/null
+++ b/clients/memflush.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+clients/memflush -v --servers localhost

diff --git a/clients/memparse.sh b/clients/memparse.sh
new file mode 100755 (executable)
index 0000000..f18b8e0
--- /dev/null
+++ b/clients/memparse.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+clients/memparse --server=localhost:11211/?1 --server=127.0.0.1:11211/?2

diff --git a/clients/memping.sh b/clients/memping.sh
new file mode 100755 (executable)
index 0000000..33100e7
--- /dev/null
+++ b/clients/memping.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+clients/memping -v --servers localhost

diff --git a/clients/memrm.sh b/clients/memrm.sh
new file mode 100755 (executable)
index 0000000..5b170d6
--- /dev/null
+++ b/clients/memrm.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+clients/memrm -v --servers localhost mem.testdata

diff --git a/clients/memslap.sh b/clients/memslap.sh
new file mode 100755 (executable)
index 0000000..85b78ef
--- /dev/null
+++ b/clients/memslap.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+clients/memslap -v --servers localhost

diff --git a/clients/memstat.sh b/clients/memstat.sh
new file mode 100755 (executable)
index 0000000..b52ba65
--- /dev/null
+++ b/clients/memstat.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+clients/memstat -v --servers localhost

diff --git a/clients/memtouch.sh b/clients/memtouch.sh
new file mode 100755 (executable)
index 0000000..2d5ccc0
--- /dev/null
+++ b/clients/memtouch.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+clients/memtouch -v --servers localhost mem.testdata