# HG changeset patch # User Maxim Dounin # Date 1262011363 0 # Node ID 01e86a067f05a410c95544ce48b264784640d965 # Parent 8ac1faaddd2c847b3d93cb03d2119689f7451ded Tests: fix tests for repcached and memcached 1.2.7+. diff --git a/memcached.t b/memcached.t --- 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')