[libtest-unit-perl] 02/05: Make test-suite work with Perl 5.14 and later

Axel Beckert abe at deuxchevaux.org
Thu Dec 26 01:05:45 UTC 2013


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

abe pushed a commit to branch master
in repository libtest-unit-perl.

commit e2137d3fdd62b288be1ac1a64bcd6287e9294859
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu Dec 26 01:34:09 2013 +0100

    Make test-suite work with Perl 5.14 and later
    
    Patch test-suite to work with regexp string representations of Perl
    5.14 or later.
    
    Add according version restriction to build-dependency.
---
 debian/changelog                                   |  2 ++
 debian/control                                     |  2 +-
 .../patches/30_fix-xism-test-suite-failures.patch  | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9e9a2d3..921ea3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ libtest-unit-perl (0.25-2) UNRELEASED; urgency=low
   * Remove ancient 10_examples.patch as it causes many test suite
     failures. Move contained files to debian/test-case-examples and
     install them via debian/examples and dh_installexamples.
+  * Patch test-suite to work with regexp string representations of Perl
+    5.14 or later. Add according version restriction to build-dependency.
 
  -- gregor herrmann <gregoa at debian.org>  Tue, 09 Oct 2007 22:32:29 +0200
 
diff --git a/debian/control b/debian/control
index 9681e9d..de5c2c6 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: libclass-inner-perl,
                      libdevel-symdump-perl,
                      liberror-perl,
-                     perl
+                     perl (>= 5.14)
 Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libtest-unit-perl.git
 Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libtest-unit-perl.git
diff --git a/debian/patches/30_fix-xism-test-suite-failures.patch b/debian/patches/30_fix-xism-test-suite-failures.patch
new file mode 100644
index 0000000..52d5c1b
--- /dev/null
+++ b/debian/patches/30_fix-xism-test-suite-failures.patch
@@ -0,0 +1,26 @@
+Description: Fix test-suite failures due to ?-xism vs ?^
+ ?^ was introduced with Perl 5.14 as abbreviation for ?d-imsx
+Author: Axel Beckert <abe at debian.org>
+
+Index: libtest-unit-perl/t/tlib/AssertTest.pm
+===================================================================
+--- libtest-unit-perl.orig/t/tlib/AssertTest.pm	2013-12-26 01:17:02.338121179 +0100
++++ libtest-unit-perl/t/tlib/AssertTest.pm	2013-12-26 01:17:50.658363830 +0100
+@@ -70,7 +70,7 @@
+ 
+         'bang'  => [ __LINE__, sub { shift->assert(0, 'bang')              } ],
+         'bang'  => [ __LINE__, sub { shift->assert('', 'bang')             } ],
+-        "'qux' did not match /(?-xism:foo)/"
++        "'qux' did not match /(?^:foo)/"
+                 => [ __LINE__, sub { shift->assert(qr/foo/, 'qux')         } ],
+         'bang'  => [ __LINE__, sub { shift->assert(qr/foo/, 'qux', 'bang') } ],
+         'a ne b'=> [ __LINE__, sub { shift->assert($coderef, 'a', 'b')     } ],
+@@ -253,7 +253,7 @@
+         q{expected '', got 'foo'}           => [ 'foo',  ''      ], 
+         q{expected 'foo', got ''}           => [ '',     'foo'   ], 
+         q{expected 5, got 4}                => [ $adder, 5       ], 
+-        q{'foo' did not match /(?-xism:x)/} => [ 'foo',  qr/x/   ], 
++        q{'foo' did not match /(?^:x)/} => [ 'foo',  qr/x/   ], 
+     );
+     my @tests = ();
+     while (@checks) {
diff --git a/debian/patches/series b/debian/patches/series
index b1b32c4..d30c441 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 20_fix-defined-array-warnings.patch
+30_fix-xism-test-suite-failures.patch

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



More information about the Pkg-perl-cvs-commits mailing list