[SCM] Debian packaging of libtest-simpleunit-perl branch, master, updated. 08bae05130a94ede8ce667a8f311cf555558f739
gregor herrmann
gregoa at debian.org
Tue Nov 15 19:04:22 UTC 2011
The following commit has been merged in the master branch:
commit b98c225728be5e9500b6a0046798b939313cdda8
Author: gregor herrmann <gregoa at debian.org>
Date: Tue Nov 15 19:46:27 2011 +0100
Add patch perl_re.patch: adjust regexp to work with older and newer perl
versions.
Closes: #636522
diff --git a/debian/patches/perl_re.patch b/debian/patches/perl_re.patch
new file mode 100644
index 0000000..559e3d6
--- /dev/null
+++ b/debian/patches/perl_re.patch
@@ -0,0 +1,53 @@
+Description: Adjust extended regexp to perl 5.14
+ Cf. http://search.cpan.org/~jesse/perl-5.14.0/pod/perldelta.pod#%28?^...%29_construct_signifies_default_modifiers
+Origin: vendor
+Bug: https://rt.cpan.org/Ticket/Display.html?id=72449
+Bug-Debian: http://bugs.debian.org/636522
+Forwarded: https://rt.cpan.org/Ticket/Display.html?id=72449
+Author: gregor herrmann <gregoa at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-11-15
+
+--- a/t/10_asserts.t
++++ b/t/10_asserts.t
+@@ -201,10 +201,17 @@
+ # assertExceptionMatches { 1 } 'any'
+ eval { assertExceptionMatches {1} qr{any} };
+ die "assertExceptionMatches unexpectedly succeeded" unless $@;
+- die "Unexpected error message for assertExceptionMatches {1} qr{any}: $@ ",
+- "(expected 'Expected an exception which matched /(?-xism:any)/, but none ",
+- "was raised.')"
+- unless "$@" =~ m{Expected an exception which matched \Q/(?-xism:any)/\E, but none was raised\.};
++ if ( $] >= 5.014 ) {
++ die "Unexpected error message for assertExceptionMatches {1} qr{any}: $@ ",
++ "(expected 'Expected an exception which matched /(?^:any)/, but none ",
++ "was raised.')"
++ unless "$@" =~ m{Expected an exception which matched \Q/(?^:any)/\E, but none was raised\.};
++ } else {
++ die "Unexpected error message for assertExceptionMatches {1} qr{any}: $@ ",
++ "(expected 'Expected an exception which matched /(?-xism:any)/, but none ",
++ "was raised.')"
++ unless "$@" =~ m{Expected an exception which matched \Q/(?-xism:any)/\E, but none was raised\.};
++ }
+
+ # assertExceptionMatches { 1 } 'any', $msg
+ eval { assertExceptionMatches {1} 'any', "Ack! No exception?"; };
+@@ -307,9 +314,15 @@
+ undef $res;
+
+ # assertMatches( qr{\s+}, 1 )
+- assertExceptionMatches {
+- $res = assertMatches( qr{\s+}, 1 )
+- } qr{Tested value '1' did not match wanted regex '\Q(?-xism:\s+)\E};
++ if ( $] >= 5.014 ) {
++ assertExceptionMatches {
++ $res = assertMatches( qr{\s+}, 1 )
++ } qr{Tested value '1' did not match wanted regex '\Q(?^:\s+)\E};
++ } else {
++ assertExceptionMatches {
++ $res = assertMatches( qr{\s+}, 1 )
++ } qr{Tested value '1' did not match wanted regex '\Q(?-xism:\s+)\E};
++ }
+ assertNot( $res );
+ undef $res;
+ },
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3a82c03
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+perl_re.patch
--
Debian packaging of libtest-simpleunit-perl
More information about the Pkg-perl-cvs-commits
mailing list