Merge branch 'stable/2.12'

Conflicts: Changes dist.ini t/metaclasses/meta_name.t
moose · Sep 20, 2014 · 27b09ef · 27b09ef
2 parents 5a50a09 + 126318e
commit 27b09ef
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -3,6 +3,10 @@ for, noteworthy changes.
 
 {{$NEXT}}
 
+  [TEST FIXES]
+
+  - fix tests that fail on altered warning messages in perl 5.21.4 (RT#98987)
+
 2.1302   2014-08-19 (TRIAL RELEASE)
 
   [BUG FIXES]
@@ -45,6 +49,12 @@ for, noteworthy changes.
     get_overload_fallback_value() and set_overload_fallback_value() methods to
     deal with this explicitly. This is arguably a bug fix.
 
+2.1212   2014-09-19
+
+  [TEST FIXES]
+
+  - fix tests that fail on altered warning messages in perl 5.21.4 (RT#98987)
+
 2.1211   2014-08-11
 
   [DOCUMENTATION]

diff --git a/dist.ini b/dist.ini
@@ -31,6 +31,7 @@ exclude_match = ^t/recipes/(?!basics_geonome_overloadingsubtypesandcoercion)
 exclude_match = ^Moose-[\d.]+
 exclude_match = ^nytprof.*
 exclude_filename = Makefile.PL
+exclude_match = ^\.
 
 [PruneCruft]
 [ManifestSkip]  ; we have no MANIFEST.SKIP file, so this is a no-op
@@ -205,6 +206,7 @@ Devel::GlobalDestruction    = 0
 Eval::Closure               = 0.04
 List::MoreUtils             = 0.28
 Module::Runtime             = 0.014
+Module::Runtime::Conflicts  = 0
 MRO::Compat                 = 0.05
 Package::DeprecationManager = 0.11
 Package::Stash              = 0.32

diff --git a/t/basics/always_strict_warnings.t b/t/basics/always_strict_warnings.t
@@ -9,7 +9,7 @@ use Test::More;
 
     eval '$foo = 5;';
     ::ok($@, '... got an error because strict is on');
-    ::like($@, qr/Global symbol \"\$foo\" requires explicit package name at/, '... got the right error');
+    ::like($@, qr/Global symbol \"\$foo\" requires explicit package name /, '... got the right error');
 
     {
         my $warn;
@@ -31,7 +31,7 @@ use Test::More;
 
     eval '$foo = 5;';
     ::ok($@, '... got an error because strict is on');
-    ::like($@, qr/Global symbol \"\$foo\" requires explicit package name at/, '... got the right error');
+    ::like($@, qr/Global symbol \"\$foo\" requires explicit package name /, '... got the right error');
 
     {
         my $warn;
@@ -53,7 +53,7 @@ use Test::More;
 
     eval '$foo = 5;';
     ::ok($@, '... got an error because strict is on');
-    ::like($@, qr/Global symbol \"\$foo\" requires explicit package name at/, '... got the right error');
+    ::like($@, qr/Global symbol \"\$foo\" requires explicit package name /, '... got the right error');
 
     {
         my $warn;