+# Pre-5.10 perls pollute %INC on unsuccesfull module
+# require, making it appear as if the module is already
+# loaded on subsequent require()s
+# Can't seem to find the exact RT/perldelta entry
+BEGIN {
+ if ($] < 5.010) {
+ # shut up spurious warnings without loading warnings.pm
+ *CORE::GLOBAL::require = sub {};
+
+ *CORE::GLOBAL::require = sub {
+ my $res = eval { CORE::require($_[0]) };
+ if ($@) {
+ delete $INC{$_[0]};
+ die
+ }
+ $res;
+ }
+ }
+}
+
use strict;
use warnings;
my @modules = grep {
my $mod = $_;
- # trap deprecation warnings and whatnot
- local $SIG{__WARN__} = sub {};
-
# not all modules are loadable at all times
- eval "require $mod" ? $mod : do {
- SKIP: { skip "Failed require of $mod: $@", 1 };
- ();
+ do {
+ # trap deprecation warnings and whatnot
+ local $SIG{__WARN__} = sub {};
+ eval "require $mod";
+ } ? $mod : do {
+ SKIP: { skip "Failed require of $mod: " . ($@ =~ /^(.+?)$/m)[0], 1 };
+ (); # empty RV for @modules
};
-
} find_modules();
# have an exception table for old and/or weird code we are not sure
# G::L::D is unclean, but we never inherit from it
'DBIx::Class::Admin::Descriptive',
'DBIx::Class::Admin::Usage',
-
- # exempt due to the __BROKEN_NC constant
- 'DBIx::Class::Carp',
) };
my $has_cmop = eval { require Class::MOP };
for my $name (keys %all_method_like) {
- next if ( DBIx::Class::Carp::__BROKEN_NC() and $name =~ /^carp(?:_unique|_once)?$/ );
+ next if ( DBIx::Class::_ENV_::BROKEN_NAMESPACE_CLEAN() and $name =~ /^carp(?:_unique|_once)?$/ );
# overload is a funky thing - it is neither cleaned, and its imports are named funny
next if $name =~ /^\(/;
}
}
- next if DBIx::Class::Carp::__BROKEN_NC();
+ next if DBIx::Class::_ENV_::BROKEN_NAMESPACE_CLEAN();
# some common import names (these should never ever be methods)
for my $f (qw/carp carp_once carp_unique croak confess cluck try catch finally/) {