diff -Nru libextutils-parsexs-perl-3.210000/Changes libextutils-parsexs-perl-3.220000/Changes --- libextutils-parsexs-perl-3.210000/Changes 2013-08-09 17:08:53.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/Changes 2013-08-29 17:28:35.000000000 +0000 @@ -1,5 +1,9 @@ Revision history for Perl extension ExtUtils::ParseXS. +3.22 - Thu Aug 29 19:30:00 CET 2013 + - Fix parallel testing crashes. + - Explicitly require new-enough Exporter. + 3.21 - Fri Aug 9 19:08:00 CET 2013 - stop "sv_2mortal(&PL_sv_yes)" and "(void)sv_newmortal()" for immortal typemap entries [perl #116152] diff -Nru libextutils-parsexs-perl-3.210000/MANIFEST libextutils-parsexs-perl-3.220000/MANIFEST --- libextutils-parsexs-perl-3.210000/MANIFEST 2013-08-09 17:13:15.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/MANIFEST 2013-08-29 17:29:47.000000000 +0000 @@ -18,7 +18,6 @@ t/001-basic.t t/002-more.t t/003-usage.t -t/004-nolinenumbers.t t/101-standard_typemap_locations.t t/102-trim_whitespace.t t/103-tidy_type.t diff -Nru libextutils-parsexs-perl-3.210000/META.json libextutils-parsexs-perl-3.220000/META.json --- libextutils-parsexs-perl-3.210000/META.json 2013-08-09 17:13:15.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/META.json 2013-08-29 17:29:47.000000000 +0000 @@ -35,7 +35,7 @@ "Carp" : "0", "Cwd" : "0", "DynaLoader" : "0", - "Exporter" : "0", + "Exporter" : "5.57", "ExtUtils::CBuilder" : "0", "ExtUtils::MakeMaker" : "6.46", "File::Basename" : "0", @@ -54,5 +54,5 @@ "url" : "git://perl5.git.perl.org/gitroot/perl.git" } }, - "version" : "3.21" + "version" : "3.22" } diff -Nru libextutils-parsexs-perl-3.210000/META.yml libextutils-parsexs-perl-3.220000/META.yml --- libextutils-parsexs-perl-3.210000/META.yml 2013-08-09 17:13:15.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/META.yml 2013-08-29 17:29:47.000000000 +0000 @@ -21,7 +21,7 @@ Carp: 0 Cwd: 0 DynaLoader: 0 - Exporter: 0 + Exporter: 5.57 ExtUtils::CBuilder: 0 ExtUtils::MakeMaker: 6.46 File::Basename: 0 @@ -31,4 +31,4 @@ resources: bugtracker: http://rt.perl.org/rt3/ repository: git://perl5.git.perl.org/gitroot/perl.git -version: 3.21 +version: 3.22 diff -Nru libextutils-parsexs-perl-3.210000/Makefile.PL libextutils-parsexs-perl-3.220000/Makefile.PL --- libextutils-parsexs-perl-3.210000/Makefile.PL 2012-11-19 06:22:08.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/Makefile.PL 2013-08-29 17:24:19.000000000 +0000 @@ -64,7 +64,7 @@ 'Carp' => 0, 'Cwd' => 0, 'DynaLoader' => 0, - 'Exporter' => 0, + 'Exporter' => '5.57', 'ExtUtils::CBuilder' => 0, 'File::Basename' => 0, 'File::Spec' => 0, diff -Nru libextutils-parsexs-perl-3.210000/debian/changelog libextutils-parsexs-perl-3.220000/debian/changelog --- libextutils-parsexs-perl-3.210000/debian/changelog 2013-08-11 21:21:00.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/debian/changelog 2013-12-19 03:59:29.000000000 +0000 @@ -1,3 +1,9 @@ +libextutils-parsexs-perl (3.220000-0ubuntu1~ppa1) trusty; urgency=low + + * Imported Upstream version 3.220000. + + -- Ricardo Salveti de Araujo Thu, 19 Dec 2013 01:58:55 -0200 + libextutils-parsexs-perl (3.210000-1) unstable; urgency=low * Imported Upstream version 3.210000. diff -Nru libextutils-parsexs-perl-3.210000/lib/ExtUtils/ParseXS/Constants.pm libextutils-parsexs-perl-3.220000/lib/ExtUtils/ParseXS/Constants.pm --- libextutils-parsexs-perl-3.210000/lib/ExtUtils/ParseXS/Constants.pm 2013-08-09 17:09:27.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/lib/ExtUtils/ParseXS/Constants.pm 2013-08-29 17:29:03.000000000 +0000 @@ -3,7 +3,7 @@ use warnings; use Symbol; -our $VERSION = '3.21'; +our $VERSION = '3.22'; =head1 NAME diff -Nru libextutils-parsexs-perl-3.210000/lib/ExtUtils/ParseXS/CountLines.pm libextutils-parsexs-perl-3.220000/lib/ExtUtils/ParseXS/CountLines.pm --- libextutils-parsexs-perl-3.210000/lib/ExtUtils/ParseXS/CountLines.pm 2013-08-09 17:09:27.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/lib/ExtUtils/ParseXS/CountLines.pm 2013-08-29 17:29:03.000000000 +0000 @@ -1,7 +1,7 @@ package ExtUtils::ParseXS::CountLines; use strict; -our $VERSION = '3.21'; +our $VERSION = '3.22'; our $SECTION_END_MARKER; diff -Nru libextutils-parsexs-perl-3.210000/lib/ExtUtils/ParseXS/Eval.pm libextutils-parsexs-perl-3.220000/lib/ExtUtils/ParseXS/Eval.pm --- libextutils-parsexs-perl-3.210000/lib/ExtUtils/ParseXS/Eval.pm 2013-08-09 17:09:27.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/lib/ExtUtils/ParseXS/Eval.pm 2013-08-29 17:29:03.000000000 +0000 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '3.21'; +our $VERSION = '3.22'; =head1 NAME diff -Nru libextutils-parsexs-perl-3.210000/lib/ExtUtils/ParseXS/Utilities.pm libextutils-parsexs-perl-3.220000/lib/ExtUtils/ParseXS/Utilities.pm --- libextutils-parsexs-perl-3.210000/lib/ExtUtils/ParseXS/Utilities.pm 2013-08-09 17:09:27.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/lib/ExtUtils/ParseXS/Utilities.pm 2013-08-29 17:29:03.000000000 +0000 @@ -6,7 +6,7 @@ use lib qw( lib ); use ExtUtils::ParseXS::Constants (); -our $VERSION = '3.21'; +our $VERSION = '3.22'; our (@ISA, @EXPORT_OK); @ISA = qw(Exporter); diff -Nru libextutils-parsexs-perl-3.210000/lib/ExtUtils/ParseXS.pm libextutils-parsexs-perl-3.220000/lib/ExtUtils/ParseXS.pm --- libextutils-parsexs-perl-3.210000/lib/ExtUtils/ParseXS.pm 2013-08-09 17:07:48.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/lib/ExtUtils/ParseXS.pm 2013-08-29 17:29:03.000000000 +0000 @@ -11,7 +11,7 @@ our $VERSION; BEGIN { - $VERSION = '3.21'; + $VERSION = '3.22'; } use ExtUtils::ParseXS::Constants $VERSION; use ExtUtils::ParseXS::CountLines $VERSION; diff -Nru libextutils-parsexs-perl-3.210000/lib/ExtUtils/Typemaps/Cmd.pm libextutils-parsexs-perl-3.220000/lib/ExtUtils/Typemaps/Cmd.pm --- libextutils-parsexs-perl-3.210000/lib/ExtUtils/Typemaps/Cmd.pm 2013-08-09 17:07:57.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/lib/ExtUtils/Typemaps/Cmd.pm 2013-08-29 17:29:03.000000000 +0000 @@ -2,7 +2,7 @@ use 5.006001; use strict; use warnings; -our $VERSION = '3.21'; +our $VERSION = '3.22'; use ExtUtils::Typemaps; diff -Nru libextutils-parsexs-perl-3.210000/lib/ExtUtils/Typemaps/InputMap.pm libextutils-parsexs-perl-3.220000/lib/ExtUtils/Typemaps/InputMap.pm --- libextutils-parsexs-perl-3.210000/lib/ExtUtils/Typemaps/InputMap.pm 2013-08-09 17:07:57.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/lib/ExtUtils/Typemaps/InputMap.pm 2013-08-29 17:29:03.000000000 +0000 @@ -2,7 +2,7 @@ use 5.006001; use strict; use warnings; -our $VERSION = '3.21'; +our $VERSION = '3.22'; =head1 NAME diff -Nru libextutils-parsexs-perl-3.210000/lib/ExtUtils/Typemaps/OutputMap.pm libextutils-parsexs-perl-3.220000/lib/ExtUtils/Typemaps/OutputMap.pm --- libextutils-parsexs-perl-3.210000/lib/ExtUtils/Typemaps/OutputMap.pm 2013-08-09 17:07:57.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/lib/ExtUtils/Typemaps/OutputMap.pm 2013-08-29 17:29:03.000000000 +0000 @@ -2,7 +2,7 @@ use 5.006001; use strict; use warnings; -our $VERSION = '3.21'; +our $VERSION = '3.22'; =head1 NAME diff -Nru libextutils-parsexs-perl-3.210000/lib/ExtUtils/Typemaps/Type.pm libextutils-parsexs-perl-3.220000/lib/ExtUtils/Typemaps/Type.pm --- libextutils-parsexs-perl-3.210000/lib/ExtUtils/Typemaps/Type.pm 2013-08-09 17:07:57.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/lib/ExtUtils/Typemaps/Type.pm 2013-08-29 17:29:03.000000000 +0000 @@ -4,7 +4,7 @@ use warnings; require ExtUtils::Typemaps; -our $VERSION = '3.21'; +our $VERSION = '3.22'; =head1 NAME diff -Nru libextutils-parsexs-perl-3.210000/lib/ExtUtils/Typemaps.pm libextutils-parsexs-perl-3.220000/lib/ExtUtils/Typemaps.pm --- libextutils-parsexs-perl-3.210000/lib/ExtUtils/Typemaps.pm 2013-08-09 17:07:48.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/lib/ExtUtils/Typemaps.pm 2013-08-29 17:29:03.000000000 +0000 @@ -2,7 +2,7 @@ use 5.006001; use strict; use warnings; -our $VERSION = '3.21'; +our $VERSION = '3.22'; #use Carp qw(croak); require ExtUtils::ParseXS; diff -Nru libextutils-parsexs-perl-3.210000/t/001-basic.t libextutils-parsexs-perl-3.220000/t/001-basic.t --- libextutils-parsexs-perl-3.210000/t/001-basic.t 2013-06-25 17:00:43.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/t/001-basic.t 2013-08-29 17:26:48.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/perl use strict; -use Test::More tests => 14; +use Test::More tests => 17; use Config; use DynaLoader; use ExtUtils::CBuilder; @@ -16,6 +16,7 @@ ######################### +{ # first block: try without linenumbers my $pxs = ExtUtils::ParseXS->new; # Try sending to filehandle tie *FH, 'Foo'; @@ -121,7 +122,50 @@ 1 while unlink $_; } } +} + +##################################################################### + +{ # second block: try with linenumbers +my $pxs = ExtUtils::ParseXS->new; +# Try sending to filehandle +tie *FH, 'Foo'; +$pxs->process_file( + filename => 'XSTest.xs', + output => \*FH, + prototypes => 1, + linenumbers => 0, +); +like tied(*FH)->content, '/is_even/', "Test that output contains some text"; +$source_file = 'XSTest.c'; + +# Try sending to file +$pxs->process_file( + filename => 'XSTest.xs', + output => $source_file, + prototypes => 0, + linenumbers => 0, +); +ok -e $source_file, "Create an output file"; + + +my $seen = 0; +open my $IN, '<', $source_file + or die "Unable to open $source_file: $!"; +while (my $l = <$IN>) { + $seen++ if $l =~ m/#line\s1\s/; +} +close $IN or die "Unable to close $source_file: $!"; +is( $seen, 0, "No linenumbers created in output file, as intended" ); + +unless ($ENV{PERL_NO_CLEANUP}) { + for ( $obj_file, $lib_file, $source_file) { + next unless defined $_; + 1 while unlink $_; + } +} +} ##################################################################### sub Foo::TIEHANDLE { bless {}, 'Foo' } diff -Nru libextutils-parsexs-perl-3.210000/t/004-nolinenumbers.t libextutils-parsexs-perl-3.220000/t/004-nolinenumbers.t --- libextutils-parsexs-perl-3.210000/t/004-nolinenumbers.t 2013-05-08 05:37:10.000000000 +0000 +++ libextutils-parsexs-perl-3.220000/t/004-nolinenumbers.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -#!/usr/bin/perl - -use strict; -use Test::More tests => 11; -use Config; -use DynaLoader; -use ExtUtils::CBuilder; - -my ($source_file, $obj_file, $lib_file); - -require_ok( 'ExtUtils::ParseXS' ); -ExtUtils::ParseXS->import('process_file'); - -chdir('t') if -d 't'; - -use Carp; $SIG{__WARN__} = \&Carp::cluck; - -######################### - -# Try sending to filehandle -tie *FH, 'Foo'; -process_file( - filename => 'XSTest.xs', - output => \*FH, - prototypes => 1, - linenumbers => 0, -); -like tied(*FH)->content, '/is_even/', "Test that output contains some text"; - -$source_file = 'XSTest.c'; - -# Try sending to file -process_file( - filename => 'XSTest.xs', - output => $source_file, - prototypes => 0, - linenumbers => 0, -); -ok -e $source_file, "Create an output file"; - -my $quiet = $ENV{PERL_CORE} && !$ENV{HARNESS_ACTIVE}; -my $b = ExtUtils::CBuilder->new(quiet => $quiet); - -SKIP: { - skip "no compiler available", 2 - if ! $b->have_compiler; - $obj_file = $b->compile( source => $source_file ); - ok $obj_file, "ExtUtils::CBuilder::compile() returned true value"; - ok -e $obj_file, "Make sure $obj_file exists"; -} - -SKIP: { - skip "no dynamic loading", 5 - if !$b->have_compiler || !$Config{usedl}; - my $module = 'XSTest'; - $lib_file = $b->link( objects => $obj_file, module_name => $module ); - ok $lib_file, "ExtUtils::CBuilder::link() returned true value"; - ok -e $lib_file, "Make sure $lib_file exists"; - - eval {require XSTest}; - is $@, '', "No error message recorded, as expected"; - ok XSTest::is_even(8), - "Function created thru XS returned expected true value"; - ok !XSTest::is_even(9), - "Function created thru XS returned expected false value"; - - # Win32 needs to close the DLL before it can unlink it, but unfortunately - # dl_unload_file was missing on Win32 prior to perl change #24679! - if ($^O eq 'MSWin32' and defined &DynaLoader::dl_unload_file) { - for (my $i = 0; $i < @DynaLoader::dl_modules; $i++) { - if ($DynaLoader::dl_modules[$i] eq $module) { - DynaLoader::dl_unload_file($DynaLoader::dl_librefs[$i]); - last; - } - } - } -} - -my $seen = 0; -open my $IN, '<', $source_file - or die "Unable to open $source_file: $!"; -while (my $l = <$IN>) { - $seen++ if $l =~ m/#line\s1\s/; -} -close $IN or die "Unable to close $source_file: $!"; -is( $seen, 0, "No linenumbers created in output file, as intended" ); - - -unless ($ENV{PERL_NO_CLEANUP}) { - for ( $obj_file, $lib_file, $source_file) { - next unless defined $_; - 1 while unlink $_; - } -} - -##################################################################### - -sub Foo::TIEHANDLE { bless {}, 'Foo' } -sub Foo::PRINT { shift->{buf} .= join '', @_ } -sub Foo::content { shift->{buf} }