Merge 'trunk' into 'Class-C3-PurePerl'

[gitmo/Class-C3.git] / t / 20_reinitialize.t

diff --git a/t/20_reinitialize.t b/t/20_reinitialize.t
index 680276b..0912cb4 100644 (file)
--- a/t/20_reinitialize.t
+++ b/t/20_reinitialize.t
@@ -46,6 +46,8 @@ Start with this:
     use Class::C3;    
 }
 
+Class::C3::initialize();
+
 is_deeply(
     [ Class::C3::calculateMRO('Diamond_D') ],
     [ qw(Diamond_D Diamond_B Diamond_C Diamond_A) ],
@@ -79,7 +81,13 @@ is_deeply(
     [ qw(Diamond_D Diamond_B Diamond_E Diamond_C Diamond_A) ],
     '... got the new MRO for Diamond_D');
 
-is(Diamond_D->hello, 'Diamond_C::hello', '... method still resolves with old MRO');
+# Doesn't work with core support, since reinit is not neccesary and the change
+#  takes effect immediately
+SKIP: {
+    skip "This test does not work with a c3-patched perl interpreter", 1
+        if $Class::C3::C3_IN_CORE;
+    is(Diamond_D->hello, 'Diamond_C::hello', '... method still resolves with old MRO');
+}
 
 Class::C3::reinitialize();