Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed slight dependency, and..

skip interop tests if Couchbase::Config not installed
moved Log::Fu as a Makefile.PL dependency
moved ExtUtils::H2PM as configure dependency
removed unneeded modules from MockServer.pm
added parens around (qw())
  • Loading branch information...
commit 34d6bd7776088a6467ebe49eab6e2173fb60f904 1 parent e067c89
M. Nunberg authored
13 Makefile.PL
View
@@ -112,27 +112,30 @@ WriteMakefile(
CONFIGURE_REQUIRES => {
'Dir::Self' => 0,
+ 'Log::Fu' => 0.25,
+ },
+
+ BUILD_REQUIRES => {
+ 'ExtUtils::H2PM' => 0.08,
},
PREREQ_PM => {
'Array::Assign' => 0,
- 'ExtUtils::H2PM' => 0.08,
'Class::XSAccessor' => 1.11,
'Test::More' => 0,
#These modules are needed for tests, but not strictly required for
#functionality
- 'Log::Fu' => 0.25,
'Test::Class' => 0.36,
-
+
#these are needed for asynchronous tests and modules
'POE::Sugar::Attributes' => 0.02,
'POE' => 1.312,
},
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
- clean => { FILES => 'Couchbase-Client-* COMPILER_FLAGS' },
+ clean => { FILES => 'Couchbase-Client-* COMPILER_FLAGS log.test-*' },
%MM_Options,
);
@@ -161,7 +164,7 @@ sub const_cccmd {
sub libscan {
my ($self,$path) = @_;
- if($path =~ /\.pl$/i) {
+ if($path =~ /\.pl$/i || $path =~ /PLCB_Conf/) {
return "";
} else {
return $path;
2  lib/Couchbase/Client.pm
View
@@ -2,7 +2,7 @@ package Couchbase::Client;
BEGIN {
require XSLoader;
- our $VERSION = '0.14_0';
+ our $VERSION = '0.15_0';
XSLoader::load(__PACKAGE__, $VERSION);
}
2  lib/Couchbase/Client/Async.pm
View
@@ -1,7 +1,7 @@
package Couchbase::Client::Async;
use strict;
use warnings;
-our $VERSION = '0.14_0';
+our $VERSION = '0.15_0';
require XSLoader;
XSLoader::load('Couchbase::Client', $VERSION);
use Couchbase::Client;
4 lib/Couchbase/MockServer.pm
View
@@ -1,13 +1,9 @@
package Couchbase::MockServer;
use strict;
use warnings;
-use File::Basename;
-use URI;
-use File::Path qw(mkpath);
use IO::Socket::INET;
use Socket;
use POSIX qw(:errno_h :signal_h :sys_wait_h);
-use Time::HiRes;
use Log::Fu { level => "warn" };
use Data::Dumper;
use Time::HiRes qw(sleep);
7 lib/Couchbase/Test/Interop.pm
View
@@ -25,6 +25,11 @@ if($] < 5.010) {
"segfaults on perls < 5.10");
}
+eval {
+ require Couchbase::Config::UA; 1;
+} or __PACKAGE__->SKIP_CLASS(
+ "Need Couchbase::Config for interop tests\n$@");
+
sub _setup_client :Test(startup) {
my $self = shift;
@@ -79,7 +84,7 @@ sub T30_interop_init :Test(no_plan)
{
my $self = shift;
my $memd = $self->memd();
- foreach my $key qw(foo bar baz) {
+ foreach my $key (qw(foo bar baz)) {
my $value = scalar reverse($key);
ok($memd->set($key, $value), "Set value OK");
is($memd->get($key), $value, "Got back our value");
Please sign in to comment.
Something went wrong with that request. Please try again.