Fix false-positives in the no-external-evals assert ( ddcc02d14 )

[dbsrgits/DBIx-Class.git] / t / 85utf8.t

diff --git a/t/85utf8.t b/t/85utf8.t
index 64b4994..3e44835 100644 (file)
--- a/t/85utf8.t
+++ b/t/85utf8.t
@@ -1,9 +1,11 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+
 use strict;
 use warnings;
 
 use Test::More;
 use Test::Warn;
-use lib qw(t/lib);
+
 use DBICTest;
 
 {
@@ -87,7 +89,7 @@ warnings_like (
 my $schema = DBICTest->init_schema();
 DBICTest::Schema::CD->load_components('UTF8Columns');
 DBICTest::Schema::CD->utf8_columns('title');
-Class::C3->reinitialize();
+Class::C3->reinitialize() if DBIx::Class::_ENV_::OLD_MRO;
 
 # as per http://search.cpan.org/dist/Test-Simple/lib/Test/More.pm#utf8
 binmode (Test::More->builder->$_, ':utf8') for qw/output failure_output todo_output/;