changeset 122:01e86a067f05

Tests: fix tests for repcached and memcached 1.2.7+.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 28 Dec 2009 14:42:43 +0000
parents 8ac1faaddd2c
children 8aa0dd396a83
files memcached.t
diffstat 1 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/memcached.t
+++ b/memcached.t
@@ -58,7 +58,19 @@ http {
 
 EOF
 
-$t->run_daemon('memcached', '-l', '127.0.0.1', '-p', '8081');
+my $memhelp = `memcached -h`;
+my @memopts = ();
+
+if ($memhelp =~ /repcached/) {
+	# repcached patch adds additional listen socket
+	push @memopts, '-X', '8082';
+}
+if ($memhelp =~ /-U/) {
+	# UDP port is on by default in memcached 1.2.7+
+	push @memopts, '-U', '0';
+}
+
+$t->run_daemon('memcached', '-l', '127.0.0.1', '-p', '8081', @memopts);
 $t->run();
 
 $t->waitforsocket('127.0.0.1:8081')