[dh-make-perl] 01/03: t/DpkgLists.t: remove trailing newline from `dpkg-archivecture` call adapt Errno and UNIX::Socket tests to the new perl package layout

[Damyan Ivanov]

This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to branch master
in repository dh-make-perl.

commit 698778366b6a284ec76c141e96392f405bc0f4b8
Author: Damyan Ivanov <dmn at debian.org>
Date:   Tue Sep 8 08:04:56 2015 +0000

    t/DpkgLists.t: remove trailing newline from `dpkg-archivecture` call
    adapt Errno and UNIX::Socket tests to the new perl package layout
    
    Fixes the test when perl is 5.22 or newer.
    
    Really closes: #789729 -- FTBFS with perl 5.22
---
 debian/changelog | 7 +++++++
 t/DpkgLists.t    | 7 +++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b15fd06..7528bdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 dh-make-perl (0.87-2) UNRELEASED; urgency=medium
 
+  [ gregor herrmann ]
   * DhMakePerl::Command::Packaging: extract_name_ver_from_build(): take
     the correct parameter from the regex when parsing the name out of
     Build.PL.
 
+  [ Damyan Ivanov ]
+  * t/DpkgLists.t: remove trailing newline from `dpkg-archivecture` call
+    Fixes the test when perl is 5.22 or newer.
+    Really Closes: #789729 -- FTBFS with perl 5.22
+
+
  -- gregor herrmann <gregoa at debian.org>  Tue, 28 Jul 2015 18:19:41 +0200
 
 dh-make-perl (0.87-1) unstable; urgency=medium
diff --git a/t/DpkgLists.t b/t/DpkgLists.t
index 951ad95..b236aa9 100755
--- a/t/DpkgLists.t
+++ b/t/DpkgLists.t
@@ -15,12 +15,15 @@ my $m = 'Debian::DpkgLists';
 my $perl_api = $Config{PERL_API_REVISION}.'.'.$Config{PERL_API_VERSION};
 
 my $arch = `dpkg-architecture -q DEB_HOST_ARCH`;
+chomp($arch);
 
 my $pkg_perl_modules = "perl-modules-$perl_api";
 my $pkg_libperl = "libperl$perl_api:$arch";
 
 my $split_perl_base = ( $perl_api ge '5.22' );
 
+diag "Perl API is $perl_api";
+
 is_deeply( [ $m->scan_full_path('/usr/bin/perl') ],
     ['perl-base'], '/usr/bin/perl is in perl-base' );
 
@@ -32,13 +35,13 @@ ok( grep( 'perl-base', @found ), 'qr{/bin/perl$} is in perl-base' );
 
 is_deeply(
     [ $m->scan_perl_mod('Errno') ],
-    $split_perl_base ? [$pkg_libperl] : ['perl-base'],
+    $split_perl_base ? [$pkg_libperl, 'perl-base'] : ['perl-base'],
     'Errno is in perl-base'
 );
 
 is_deeply(
     [ $m->scan_perl_mod('IO::Socket::UNIX') ],
-    $split_perl_base ? [$pkg_libperl] : ['perl-base'],
+    $split_perl_base ? [$pkg_libperl, 'perl-base'] : ['perl-base'],
     'IO::Socket::UNIX is in perl-base'
 );
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/dh-make-perl.git