Imported Debian patch 1.21-5
This commit is contained in:
committed by
Mario Fetka
parent
8879c156fb
commit
391691ba22
53
debian/patches/perl_re.patch
vendored
Normal file
53
debian/patches/perl_re.patch
vendored
Normal file
@@ -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@debian.org>
|
||||
Reviewed-by: gregor herrmann <gregoa@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;
|
||||
},
|
||||
2
debian/patches/series
vendored
Normal file
2
debian/patches/series
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
perl_re.patch
|
||||
spelling.patch
|
||||
29
debian/patches/spelling.patch
vendored
Normal file
29
debian/patches/spelling.patch
vendored
Normal file
@@ -0,0 +1,29 @@
|
||||
Description: minor spelling fix
|
||||
Origin: vendor
|
||||
Bug: https://rt.cpan.org/Ticket/Display.html?id=72450
|
||||
Forwarded: https://rt.cpan.org/Ticket/Display.html?id=72450
|
||||
Author: gregor herrmann <gregoa@debian.org>
|
||||
Last-Update: 2011-11-15
|
||||
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -73,7 +73,7 @@
|
||||
allows a test designer to change the setup function as the tests progress. See
|
||||
the EXAMPLE section for an example of how to use this.
|
||||
|
||||
- If a test is preceeded by multiple new setup/teardown functions, the last one
|
||||
+ If a test is preceded by multiple new setup/teardown functions, the last one
|
||||
to be specified is kept, and any others are discarded after being executed
|
||||
once. This allows one to specify one-time setup and/or teardown functions at a
|
||||
given point of testing.
|
||||
--- a/lib/Test/SimpleUnit.pm
|
||||
+++ b/lib/Test/SimpleUnit.pm
|
||||
@@ -171,7 +171,7 @@
|
||||
allows a test designer to change the setup function as the tests progress. See
|
||||
the L<EXAMPLE|"EXAMPLE"> section for an example of how to use this.
|
||||
|
||||
-If a test is preceeded by multiple new setup/teardown functions, the last one to
|
||||
+If a test is preceded by multiple new setup/teardown functions, the last one to
|
||||
be specified is kept, and any others are discarded after being executed
|
||||
once. This allows one to specify one-time setup and/or teardown functions at a
|
||||
given point of testing.
|
||||
Reference in New Issue
Block a user