X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xt%2Fextra%2Flean_startup.t;h=c5ed8ccb3cc9f3f0c5234ba6ad9d69ad46872a2e;hb=12a184d0a0c1868708e43aaabefe08f9e7ac9ec4;hp=b5f5491ef2e0c2f854504a7766936caa3607dd1b;hpb=58b92e31bbd259ddf1d32e342d3978cd43d6e1af;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/xt/extra/lean_startup.t b/xt/extra/lean_startup.t
index b5f5491..c5ed8cc 100644
--- a/xt/extra/lean_startup.t
+++ b/xt/extra/lean_startup.t
@@ -40,17 +40,10 @@ BEGIN {
 
     return $res if $req =~ /^DBIx::Class|^DBICTest::/;
 
-    # FIXME - work around RT#114641
-    #
-    # Because *OF COURSE* when (questionable) unicode tests fail on < 5.8
-    # the answer is to make the entire module 5.8 only, instead of skipping
-    # the tests in question
-    # rjbs-- # thinly veiled passive aggressive bullshit
-    #
-    # The actual skip is needed because the use happens before 'package' had
-    # a chance to switch the namespace, so the shim thinks DBIC::Schema tried
-    # to require this
-    return $res if $req eq '5.008';
+    # Some modules have a bare 'use $perl_version' as the first statement
+    # Since the use() happens before 'package' had a chance to switch
+    # the namespace, the shim thinks DBIC* tried to require this
+    return $res if $req =~ /^v?[0-9.]+$/;
 
     # exclude everything where the current namespace does not match the called function
     # (this works around very weird XS-induced require callstack corruption)
@@ -141,6 +134,7 @@ BEGIN {
     Sub::Name
     Sub::Defer
     Sub::Quote
+    attributes
 
     Scalar::Util
     Storable