r47130 - in /branches/upstream/libmodule-scandeps-perl/current: Changes META.yml lib/Module/ScanDeps.pm t/11-finds-shared-lib.t t/14-scan_chunk.t t/16-scan_line.t t/7-check-dynaloader.t
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Fri Nov 13 23:51:23 UTC 2009
Author: ansgar-guest
Date: Fri Nov 13 23:51:16 2009
New Revision: 47130
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47130
Log:
[svn-upgrade] Integrating new upstream version, libmodule-scandeps-perl (0.96)
Modified:
branches/upstream/libmodule-scandeps-perl/current/Changes
branches/upstream/libmodule-scandeps-perl/current/META.yml
branches/upstream/libmodule-scandeps-perl/current/lib/Module/ScanDeps.pm
branches/upstream/libmodule-scandeps-perl/current/t/11-finds-shared-lib.t
branches/upstream/libmodule-scandeps-perl/current/t/14-scan_chunk.t
branches/upstream/libmodule-scandeps-perl/current/t/16-scan_line.t
branches/upstream/libmodule-scandeps-perl/current/t/7-check-dynaloader.t
Modified: branches/upstream/libmodule-scandeps-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/Changes?rev=47130&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/Changes (original)
+++ branches/upstream/libmodule-scandeps-perl/current/Changes Fri Nov 13 23:51:16 2009
@@ -1,3 +1,8 @@
+
+[Changes for 0.96 - 2009-11-13]
+* perl 5.6.1 compatibility (Alexandr Ciornii)
+* Test for "use module version;" (Alexandr Ciornii)
+
[Changes for 0.95 - 2009-10-16]
* Fix "uninitialized value" warnings (Dave Rolsky)
* Add special case for Perl::Critic (Alexandr Ciornii)
Modified: branches/upstream/libmodule-scandeps-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/META.yml?rev=47130&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/META.yml (original)
+++ branches/upstream/libmodule-scandeps-perl/current/META.yml Fri Nov 13 23:51:16 2009
@@ -27,4 +27,4 @@
resources:
license: http://dev.perl.org/licenses/
repository: http://svn.openfoundry.org/par/Module-ScanDeps/trunk/
-version: 0.95
+version: 0.96
Modified: branches/upstream/libmodule-scandeps-perl/current/lib/Module/ScanDeps.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/lib/Module/ScanDeps.pm?rev=47130&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/lib/Module/ScanDeps.pm (original)
+++ branches/upstream/libmodule-scandeps-perl/current/lib/Module/ScanDeps.pm Fri Nov 13 23:51:16 2009
@@ -4,7 +4,7 @@
use warnings;
use vars qw( $VERSION @EXPORT @EXPORT_OK @ISA $CurrentPackage @IncludeLibs $ScanFileRE );
-$VERSION = '0.95';
+$VERSION = '0.96';
@EXPORT = qw( scan_deps scan_deps_runtime );
@EXPORT_OK = qw( scan_line scan_chunk add_deps scan_deps_runtime path_to_inc_name );
Modified: branches/upstream/libmodule-scandeps-perl/current/t/11-finds-shared-lib.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/t/11-finds-shared-lib.t?rev=47130&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/t/11-finds-shared-lib.t (original)
+++ branches/upstream/libmodule-scandeps-perl/current/t/11-finds-shared-lib.t Fri Nov 13 23:51:16 2009
@@ -13,6 +13,7 @@
BEGIN {
plan('skip_all', 'Cwd is builtin on OS/2') if $^O eq 'os2';
+ plan('skip_all', 'Cwd does not have a C part') if Cwd->VERSION<2.08; #2.08 has, 2.04 does not
plan(tests => 3);
}
Modified: branches/upstream/libmodule-scandeps-perl/current/t/14-scan_chunk.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/t/14-scan_chunk.t?rev=47130&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/t/14-scan_chunk.t (original)
+++ branches/upstream/libmodule-scandeps-perl/current/t/14-scan_chunk.t Fri Nov 13 23:51:16 2009
@@ -3,14 +3,14 @@
use strict;
use warnings;
-use Test::More tests => 5;
+use Test::More tests => 6;
use Module::ScanDeps qw/scan_chunk/;
{
my $chunk=<<'EOT';
use strict;
EOT
-my @array=sort (scan_chunk($chunk));
+my @array=scan_chunk($chunk);@array=sort @array; #two ops because of perl 5.6.2
is_deeply(\@array,[sort qw{strict.pm}]);
}
@@ -18,7 +18,7 @@
my $chunk=<<'EOT';
use base qw(strict);
EOT
-my @array=sort (scan_chunk($chunk));
+my @array=scan_chunk($chunk);@array=sort @array;
is_deeply(\@array,[sort qw{base.pm strict.pm}]);
}
@@ -26,7 +26,7 @@
my $chunk=<<'EOT';
use parent qw(strict);
EOT
-my @array=sort (scan_chunk($chunk));
+my @array=scan_chunk($chunk);@array=sort @array;
is_deeply(\@array,[sort qw{parent.pm strict.pm}]);
}
@@ -34,7 +34,7 @@
my $chunk=<<'EOT';
use parent::doesnotexists qw(strict);
EOT
-my @array=sort (scan_chunk($chunk));
+my @array=scan_chunk($chunk);@array=sort @array;
is_deeply(\@array,[sort qw{parent/doesnotexists.pm}]);
}
@@ -43,8 +43,15 @@
use Catalyst qw/-Debug ConfigLoader Session::State::Cookie/
EOT
#-Debug should be skipped
-my @array=sort (scan_chunk($chunk));
+my @array=scan_chunk($chunk);@array=sort @array;
is_deeply(\@array,[sort qw{Catalyst.pm Catalyst/Plugin/ConfigLoader.pm Catalyst/Plugin/Session/State/Cookie.pm}]);
}
-
+{
+my $chunk=<<'EOT';
+use I18N::LangTags 0.30 ();
+EOT
+#-Debug should be skipped
+my @array=scan_chunk($chunk);@array=sort @array;
+is_deeply(\@array,[sort qw{I18N/LangTags.pm}]);
+}
Modified: branches/upstream/libmodule-scandeps-perl/current/t/16-scan_line.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/t/16-scan_line.t?rev=47130&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/t/16-scan_line.t (original)
+++ branches/upstream/libmodule-scandeps-perl/current/t/16-scan_line.t Fri Nov 13 23:51:16 2009
@@ -10,7 +10,7 @@
my $chunk=<<'EOT';
use strict;
EOT
-my @array=sort (scan_line($chunk));
+my @array=scan_line($chunk);@array=sort @array;
is_deeply(\@array,[sort qw{strict.pm}]);
}
@@ -18,7 +18,7 @@
my $chunk=<<'EOT';
require 5.10;
EOT
-my @array=sort (scan_line($chunk));
+my @array=scan_line($chunk);@array=sort @array;
is_deeply(\@array,[sort qw{feature.pm}]);
}
Modified: branches/upstream/libmodule-scandeps-perl/current/t/7-check-dynaloader.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-scandeps-perl/current/t/7-check-dynaloader.t?rev=47130&op=diff
==============================================================================
--- branches/upstream/libmodule-scandeps-perl/current/t/7-check-dynaloader.t (original)
+++ branches/upstream/libmodule-scandeps-perl/current/t/7-check-dynaloader.t Fri Nov 13 23:51:16 2009
@@ -1,19 +1,30 @@
#!perl
+use strict;
use Test::More;
use Config ();
use Module::ScanDeps;
use Cwd;
+use File::Glob;
-my $extra = ''; # Cwd is builtin in perl*.dll; DLLs have checksum appended
-$extra = '\w\w|Glob\w\w' if $^O eq 'os2'; # So use a different dyna module
+my $extra = '';
+my $cwd_bundle_path = $INC{ 'Cwd.pm' } || $INC{ 'File/Glob.pm' };
+
+if ($^O eq 'os2' or # Cwd is builtin in perl*.dll; DLLs have checksum appended
+ Cwd->VERSION<2.08 #2.08 has dll, 2.04 does not
+) {
+ $extra = '\w\w|Glob\w\w' ; # So use a different dyna module
+ $cwd_bundle_path = $INC{ 'File/Glob.pm' };
+}
unless( $Config::Config{usedl} ){
plan('skip_all', 'Sorry, no dynamic loading');
}
-plan(tests => 2);
+plan(tests => 3);
+
+ok($cwd_bundle_path, 'Path for Cwd.pm or File/Glob.pm found');
my $rv = scan_deps_runtime(
files => [ 't/data/check-dynaloader/Bar.pm' ],
@@ -21,13 +32,12 @@
compile => 1,
);
-
my ( $entry ) = grep { /^auto\b.*\b(Cwd$extra)\.$Config::Config{dlext}/ } keys %$rv;
ok( $entry, 'we have some key that looks like it pulled in the Cwd or Glob shared lib' );
# build a path the the Cwd library based on the entry in %INC and our Module::ScanDeps path
-( my $cwd_bundle_path = $INC{ 'Cwd.pm' } || $INC{ 'File/Glob.pm' } ) =~ s,(Cwd|File/Glob)\.pm$,$entry,;
+$cwd_bundle_path =~ s,(Cwd|File/Glob)\.pm$,$entry,;
is( $rv->{$entry}->{file}, $cwd_bundle_path, 'the full bundle path we got looks legit' );
More information about the Pkg-perl-cvs-commits
mailing list