[Bps-public-commit] Shipwright branch, master, updated. fafbd460ae9cd72df0ad5491787b86c2c89c99f2
? sunnavy
sunnavy at bestpractical.com
Thu Jun 2 04:46:28 EDT 2011
The branch, master has been updated
via fafbd460ae9cd72df0ad5491787b86c2c89c99f2 (commit)
via a2ff9c8cd796e2602df484fab0380928cbacf3e2 (commit)
via 0932ed326d8f9d76f846c349f639b46b84cb1f02 (commit)
via 3bebb69ebc6f57507bf98d9ad65062b003b132a9 (commit)
via 55e6a11359ceaa992d826808095672dab0446afe (commit)
via 821f5ae705a87d12dfa392e5d221626db88ae1e4 (commit)
from a259bc515a7a181e1b3b04797d23bf84d912a054 (commit)
Summary of changes:
META.yml | 2 +-
inc/Module/Install.pm | 4 +-
inc/Module/Install/AutoInstall.pm | 2 +-
inc/Module/Install/Base.pm | 2 +-
inc/Module/Install/Can.pm | 2 +-
inc/Module/Install/Fetch.pm | 2 +-
inc/Module/Install/Include.pm | 2 +-
inc/Module/Install/Makefile.pm | 2 +-
inc/Module/Install/Metadata.pm | 9 ++--
inc/Module/Install/Scripts.pm | 2 +-
inc/Module/Install/Share.pm | 4 +-
inc/Module/Install/Win32.pm | 2 +-
inc/Module/Install/WriteAll.pm | 2 +-
lib/Shipwright/Script/Import.pm | 13 +++--
lib/Shipwright/Source.pm | 23 +++++----
share/bin/shipwright-builder | 95 ++++++++++++++++++++++++++++++-------
t/04.source.t | 2 +-
t/71.script_cmds.t | 19 ++-----
18 files changed, 125 insertions(+), 64 deletions(-)
- Log -----------------------------------------------------------------
commit 821f5ae705a87d12dfa392e5d221626db88ae1e4
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu Jun 2 14:22:31 2011 +0800
clean a bit
diff --git a/lib/Shipwright/Script/Import.pm b/lib/Shipwright/Script/Import.pm
index 0483ca0..a9a2946 100644
--- a/lib/Shipwright/Script/Import.pm
+++ b/lib/Shipwright/Script/Import.pm
@@ -392,7 +392,7 @@ sub _generate_build {
my $shipwright = shift;
my @commands;
- if ( -f catfile( $source_dir, 'Build.PL' ) ) { # && $source_dir !~ /Module-Build/ ) { # M::B should be bootstrapped with MakeMaker
+ if ( -f catfile( $source_dir, 'Build.PL' ) ) {
$self->log->info( 'detected Module::Build build system' );
@commands = (
'configure: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD_PL%% Build.PL --install_base=%%INSTALL_BASE%% --install_path lib=%%INSTALL_BASE%%/lib/perl5 --install_path arch=%%INSTALL_BASE%%/lib/perl5',
commit 55e6a11359ceaa992d826808095672dab0446afe
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu Jun 2 14:53:51 2011 +0800
updae M:I to 1.01
diff --git a/META.yml b/META.yml
index 87dc8c8..b798b2d 100644
--- a/META.yml
+++ b/META.yml
@@ -9,7 +9,7 @@ build_requires:
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 1.00'
+generated_by: 'Module::Install version 1.01'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm
index 8ee839d..74caf9c 100644
--- a/inc/Module/Install.pm
+++ b/inc/Module/Install.pm
@@ -31,7 +31,7 @@ BEGIN {
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '1.00';
+ $VERSION = '1.01';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -467,4 +467,4 @@ sub _CLASS ($) {
1;
-# Copyright 2008 - 2010 Adam Kennedy.
+# Copyright 2008 - 2011 Adam Kennedy.
diff --git a/inc/Module/Install/AutoInstall.pm b/inc/Module/Install/AutoInstall.pm
index f1f5356..bc3d172 100644
--- a/inc/Module/Install/AutoInstall.pm
+++ b/inc/Module/Install/AutoInstall.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm
index b55bda3..d3662c9 100644
--- a/inc/Module/Install/Base.pm
+++ b/inc/Module/Install/Base.pm
@@ -4,7 +4,7 @@ package Module::Install::Base;
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
}
# Suspend handler for "redefined" warnings
diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm
index 71ccc27..276409a 100644
--- a/inc/Module/Install/Can.pm
+++ b/inc/Module/Install/Can.pm
@@ -9,7 +9,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm
index ec1f106..093cb7a 100644
--- a/inc/Module/Install/Fetch.pm
+++ b/inc/Module/Install/Fetch.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Include.pm b/inc/Module/Install/Include.pm
index a28cd4c..90cc979 100644
--- a/inc/Module/Install/Include.pm
+++ b/inc/Module/Install/Include.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm
index 5dfd0e9..4c71003 100644
--- a/inc/Module/Install/Makefile.pm
+++ b/inc/Module/Install/Makefile.pm
@@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm
index cfe45b3..3b01e09 100644
--- a/inc/Module/Install/Metadata.pm
+++ b/inc/Module/Install/Metadata.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -515,6 +515,7 @@ sub __extract_license {
'GNU Free Documentation license' => 'unrestricted', 1,
'GNU Affero General Public License' => 'open_source', 1,
'(?:Free)?BSD license' => 'bsd', 1,
+ 'Artistic license 2\.0' => 'artistic_2', 1,
'Artistic license' => 'artistic', 1,
'Apache (?:Software )?license' => 'apache', 1,
'GPL' => 'gpl', 1,
@@ -550,9 +551,9 @@ sub license_from {
sub _extract_bugtracker {
my @links = $_[0] =~ m#L<(
- \Qhttp://rt.cpan.org/\E[^>]+|
- \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
- \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
+ https?\Q://rt.cpan.org/\E[^>]+|
+ https?\Q://github.com/\E[\w_]+/[\w_]+/issues|
+ https?\Q://code.google.com/p/\E[\w_\-]+/issues/list
)>#gx;
my %links;
@links{@links}=();
diff --git a/inc/Module/Install/Scripts.pm b/inc/Module/Install/Scripts.pm
index 329bcc0..e9510f8 100644
--- a/inc/Module/Install/Scripts.pm
+++ b/inc/Module/Install/Scripts.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Share.pm b/inc/Module/Install/Share.pm
index f1e3bdd..1cf9330 100644
--- a/inc/Module/Install/Share.pm
+++ b/inc/Module/Install/Share.pm
@@ -8,7 +8,7 @@ use ExtUtils::Manifest ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -22,7 +22,7 @@ sub install_share {
}
unless ( defined $dir and -d $dir ) {
require Carp;
- Carp::croak("Illegal or missing directory install_share param");
+ Carp::croak("Illegal or missing directory install_share param: '$dir'");
}
# Split by type
diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm
index edc18b4..3139a63 100644
--- a/inc/Module/Install/Win32.pm
+++ b/inc/Module/Install/Win32.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm
index d0f6599..1f724a7 100644
--- a/inc/Module/Install/WriteAll.pm
+++ b/inc/Module/Install/WriteAll.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
commit 3bebb69ebc6f57507bf98d9ad65062b003b132a9
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu Jun 2 14:52:44 2011 +0800
allow to auto-detect build system if there is no one in shipyward
diff --git a/share/bin/shipwright-builder b/share/bin/shipwright-builder
index aa126c1..890bae2 100755
--- a/share/bin/shipwright-builder
+++ b/share/bin/shipwright-builder
@@ -179,9 +179,6 @@ unless ( $args{'no-install-base'} ) {
$args{'install-base'} =~ s{[/\\]$}{};
}
-
-
-
my ( $installed, $installed_file );
my $installed_hash = {};
unless ( $args{'no-install-base'} ) {
@@ -198,7 +195,6 @@ unless ( $args{'no-install-base'} ) {
$args{'install-base'} = rel2abs( $args{'install-base'} );
}
-
# YAML::Tiny objects are array based.
my $order = ( YAML::Tiny->read( catfile( 'shipwright', 'order.yml' ) ) )->[0];
@@ -307,7 +303,6 @@ sub install {
$CPAN::Config->{prerequisites_policy} = 'ignore';
};
-
# this dirty hack means that ExtUtils::AutoInstall won't try to recurse and run cpan
$ENV{'PERL5_CPANPLUS_IS_RUNNING'} = 1;
$ENV{'AUTOMATED_TESTING'} = 1; # Term::ReadLine::Perl and others
@@ -341,7 +336,7 @@ sub install {
}
else {
open my $fh, '>', '__install_base'
- or confess "can't write to __install_base: $!";
+ or confess "can't write to __install_base: $!";
print $fh $args{'install-base'};
close $fh;
@@ -486,7 +481,7 @@ sub _install {
$branch = 'vendor';
}
my $dist_dir = catdir( 'dists', $dir );
- rmtree( $dist_dir ) if -e $dist_dir;
+ rmtree($dist_dir) if -e $dist_dir;
rcopy( catdir( 'sources', $dir, split /\//, $branch ), $dist_dir )
or confess "copy sources/$dir/$branch to dists/$dir failed: $!";
}
@@ -522,13 +517,21 @@ sub _install {
: ( ' with value ' . ( $? >> 8 ) )
) . "\n";
my $error =
- "build $dir failed, the last output of build.log is:\n"
- . "\t" . _get_log();
+ "build $dir failed, the last output of build.log is:\n" . "\t"
+ . _get_log();
confess $error;
}
}
else {
- my $cmds = cmds( catfile( '..', '..', 'scripts', $dir, 'build' ) );
+ my $cmds;
+ if ( -e catfile( '..', '..', 'scripts', $dir, 'build' ) ) {
+ print $log "found build for $dir, will install $dir using that\n";
+ $cmds = cmds( catfile( '..', '..', 'scripts', $dir, 'build' ) );
+ }
+ else {
+ print $log "no build for $dir, will detect\n";
+ $cmds = detect_cmds( '.' );
+ }
for (@$cmds) {
my ( $type, $cmd ) = @$_;
@@ -569,7 +572,8 @@ sub _install {
# clean is trivial, we'll just ignore if 'clean' fails
my $error =
"build $dir $type part failed, last output of build.log is:\n"
- . "\t" . _get_log();
+ . "\t"
+ . _get_log();
confess $error;
}
}
@@ -613,8 +617,9 @@ sub wrap_bin {
if ( -T $file ) {
open my $fh, '<', $file or confess "can't open $file: $!";
my $shebang = <$fh>;
- if ( defined($shebang) &&
- $shebang =~ m{
+ if (
+ defined($shebang)
+ && $shebang =~ m{
\Q$args{'install-base'}\E(?:/|\\)(?:s?bin)(?:/|\\)(\w+)
|\benv\s+(\w+)
}x
@@ -727,14 +732,18 @@ sub cmds {
my @cmds;
- {
+ if ( ref $file eq 'ARRAY' ) {
+ @cmds = @$file;
+ }
+ elsif ( -e $file ) {
open my $fh, '<', $file or confess "$!: $file";
@cmds = <$fh>;
close $fh;
chomp @cmds;
- @cmds = map { substitute($_) } @cmds;
}
+ @cmds = map { substitute($_) } @cmds;
+
my $return = [];
for (@cmds) {
my ( $type, $cmd );
@@ -757,7 +766,7 @@ sub cmds {
sub clean {
open my $log, '>', 'clean.log' or confess $!;
- rmtree( 'tmp_dists');
+ rmtree('tmp_dists');
print $log "removed tmp_dists\n";
if ($branches) {
@@ -792,7 +801,15 @@ sub _clean {
'--clean';
}
else {
- my $cmds = cmds( catfile( '..', '..', 'scripts', $dir, 'build' ) );
+ my $cmds;
+ if ( -e catfile( '..', '..', 'scripts', $dir, 'build' ) ) {
+ print $log "found build for $dir, will install $dir using that\n";
+ $cmds = cmds( catfile( '..', '..', 'scripts', $dir, 'build' ) );
+ }
+ else {
+ print $log "no build for $dir, will detect\n";
+ $cmds = detect_cmds( '.' );
+ }
for (@$cmds) {
my ( $type, $c ) = @$_;
@@ -939,7 +956,7 @@ sub _get_log {
require Tie::File;
if ( tie my @array, 'Tie::File', $build_log_file, autochomp => 0 ) {
$number = @array if $number > @array;
- return join "\t", grep { defined } @array[ -1*$number .. -1 ];
+ return join "\t", grep { defined } @array[ -1 * $number .. -1 ];
}
else {
warn "failed to open $build_log_file";
@@ -947,3 +964,45 @@ sub _get_log {
}
}
+sub detect_cmds {
+ my $dir = shift;
+ if ( -f catfile( $dir, 'Build.PL' )) {
+ print $log "detected Module::Build build system\n";
+ return cmds(
+ [
+'configure: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD_PL%% Build.PL --install_base=%%INSTALL_BASE%% --install_path lib=%%INSTALL_BASE%%/lib/perl5 --install_path arch=%%INSTALL_BASE%%/lib/perl5',
+ 'make: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD%% Build',
+ 'test: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD%% Build test',
+ 'install: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD%% Build install',
+ 'clean: %%PERL%% %%MODULE_BUILD_BEFORE_BUILD%% Build realclean',
+ ]
+ );
+ }
+ if ( -f catfile( $dir, 'Makefile.PL' )) {
+ print $log "detected ExtUtils::MakeMaker build system\n";
+ return cmds(
+ [
+'configure: %%PERL%% Makefile.PL LIB=%%INSTALL_BASE%%/lib/perl5/ PREFIX=%%INSTALL_BASE%% INSTALLSITEARCH=%%INSTALL_BASE%%/lib/perl5 INSTALLARCHLIB=%%INSTALL_BASE%%/lib/perl5 %%MAKEMAKER_CONFIGURE_EXTRA%%',
+ 'make: %%MAKE%%',
+ 'test: %%MAKE%% test',
+ 'install: %%MAKE%% install',
+ 'clean: %%MAKE%% clean',
+ ]
+ );
+ }
+ if ( -f catfile( $dir, 'configure' )) {
+ print $log "detected autoconf build system\n";
+ return cmds(
+ [
+ 'configure: ./configure --prefix=%%INSTALL_BASE%%',
+ 'make: %%MAKE%%',
+ 'install: %%MAKE%% install',
+ 'clean: %%MAKE%% clean',
+ ]
+ );
+ }
+ else {
+ die "unknown build system for $dir";
+ }
+}
+
commit 0932ed326d8f9d76f846c349f639b46b84cb1f02
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu Jun 2 15:28:56 2011 +0800
--no-default-build to not keep generated build. shipwright-builder will take care of it
diff --git a/lib/Shipwright/Script/Import.pm b/lib/Shipwright/Script/Import.pm
index a9a2946..4631da6 100644
--- a/lib/Shipwright/Script/Import.pm
+++ b/lib/Shipwright/Script/Import.pm
@@ -7,7 +7,9 @@ use base qw/App::CLI::Command Shipwright::Base Shipwright::Script/;
__PACKAGE__->mk_accessors(
qw/comment no_follow build_script require_yml include_dual_lifed
name test_script extra_tests overwrite min_perl_version skip version as
- skip_recommends skip_all_test_requires skip_all_recommends skip_installed/
+ skip_recommends skip_all_test_requires skip_all_recommends skip_installed
+ no_default_build
+ /
);
use Shipwright;
@@ -36,7 +38,8 @@ sub options {
'skip-all-recommends' => 'skip_all_recommends',
'skip-all-test-requires' => 'skip_all_test_requires',
'skip-installed' => 'skip_installed',
- 'include-dual-lifed' => 'include_dual_lifed'
+ 'include-dual-lifed' => 'include_dual_lifed',
+ 'no-default-build' => 'no_default_build',
);
}
@@ -192,10 +195,9 @@ sub run {
copy( $script, catfile( $script_dir, 'build' ) );
}
}
- else {
+ elsif ( ! $self->no_default_build ) {
$self->_generate_build( $source, $script_dir, $shipwright );
}
-
}
if ( $self->no_follow ) {
@@ -486,6 +488,7 @@ Shipwright::Script::Import - Import sources and their dependencies
--skip-installed : skip all the installed modules to import
--include-dual-lifed : include modules which live both in the perl core
and on CPAN
+ --no-default-build : don't try to detect and set build system
=head1 DESCRIPTION
commit a2ff9c8cd796e2602df484fab0380928cbacf3e2
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu Jun 2 15:27:29 2011 +0800
make default source type CPAN
diff --git a/lib/Shipwright/Source.pm b/lib/Shipwright/Source.pm
index a7ab192..fa9711a 100644
--- a/lib/Shipwright/Source.pm
+++ b/lib/Shipwright/Source.pm
@@ -75,6 +75,7 @@ sub new {
sub type {
my $source = shift;
+ return unless $$source;
_translate_source($source);
@@ -87,15 +88,6 @@ sub type {
return 'Directory' if $$source =~ s/^dir(?:ectory)?://i;
return 'Shipyard' if $$source =~ s/^(?:shipyard|shipwright)://i;
- if ( $$source =~ s/^cpan://i ) {
-
- # if it's not a distribution name like
- # 'S/SU/SUNNAVY/IP-QQWry-v0.0.15.tar.gz', convert '-' to '::'.
- $$source =~ s/-/::/g
- unless $$source =~ /\.(?:tar\.(?:gz|bz2)|tgz|tbz)$/;
- return 'CPAN';
- }
-
# prefix that can be omitted
for my $type (qw/svn http ftp git/) {
if ( $$source =~ /^$type:/i ) {
@@ -109,6 +101,19 @@ sub type {
return 'SVK';
}
+ # default is cpan module or distribution
+ $$source =~ s!^cpan:!!i;
+
+ return if $$source =~ /:/ && $$source !~ /::/;
+
+
+ # if it's not a distribution name like
+ # 'S/SU/SUNNAVY/IP-QQWry-v0.0.15.tar.gz', convert '-' to '::'.
+ $$source =~ s/-/::/g
+ unless $$source =~ /\.(?:tar\.(?:gz|bz2)|tgz|tbz)$/;
+
+ return 'CPAN';
+
}
sub _translate_source {
diff --git a/t/04.source.t b/t/04.source.t
index 1b00e91..5a046ea 100644
--- a/t/04.source.t
+++ b/t/04.source.t
@@ -32,7 +32,7 @@ for ( keys %source ) {
}
}
-my @invalid_sources = ( 'file:/tmp/ok', 'foo', '' );
+my @invalid_sources = ( 'file:/tmp/ok', 'foo:bla', '' );
for (@invalid_sources) {
eval { my $source = Shipwright::Source->new( source => $_ ) };
commit fafbd460ae9cd72df0ad5491787b86c2c89c99f2
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu Jun 2 15:49:17 2011 +0800
no need to try importing foo twice, besides, foo is valid as default source is cpan
diff --git a/t/71.script_cmds.t b/t/71.script_cmds.t
index 35fb5c8..0eef289 100644
--- a/t/71.script_cmds.t
+++ b/t/71.script_cmds.t
@@ -9,10 +9,10 @@ if ( ! $ENV{SHIPWRIGHT_TEST_EXTRA} ) {
}
if ( $^O =~ /MSWin/ ) {
- plan tests => 136;
+ plan tests => 132;
}
else {
- plan tests => 140;
+ plan tests => 136;
}
use Shipwright;
@@ -36,14 +36,14 @@ my $build_base = catdir( tmpdir(), 'shipwright_build_71_scripts_cmds' );
SKIP: {
skip "git: no git found or env SHIPWRIGHT_TEST_GIT not set", ( $^O =~
- /MSWin/ ? 33 : 34 )
+ /MSWin/ ? 32 : 33 )
if skip_git();
start_test( 'git:' . create_git_repo() );
}
SKIP: {
skip "svn: no svn found or env SHIPWRIGHT_TEST_SVN not set", ( $^O =~
- /MSWin/ ? 35 : 36 )
+ /MSWin/ ? 34 : 35 )
if skip_svn();
my $repo = 'svn:' . create_svn_repo() . '/hello';
@@ -68,7 +68,7 @@ SKIP: {
SKIP: {
skip "svk: no svk found or env SHIPWRIGHT_TEST_SVK not set", ( $^O =~
- /MSWin/ ? 35 : 36 )
+ /MSWin/ ? 34 : 35 )
if skip_svk();
create_svk_repo();
@@ -122,14 +122,7 @@ sub start_test {
'import without source ...'
],
[
- [ 'import', 'foo' ],
- undef,
- undef,
- qr/invalid source: foo/,
- 'import with invalid source'
- ],
- [
- [ 'import', 'foo' ],
+ [ 'import', 'foo:bar' ],
undef,
undef,
qr/invalid source: foo/,
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list