Magic vtables aren't freed when magic is freed, so don't count them.

[p5sagit/Devel-Size.git] / t / globs.t

diff --git a/t/globs.t b/t/globs.t
index 6fdeb5f..d37826a 100644 (file)
--- a/t/globs.t
+++ b/t/globs.t
@@ -61,8 +61,6 @@ $SIG{__WARN__} = sub {
     my $copy_gv_size = total_size($copy);
     # GV copies point back to the real GV through GvEGV. They share the same GP
     # and GvFILE
-    local $TODO = 'EGV is double counted. GV - GP == '
-       . ($incremental_gv_size - $gp_size);
     is($copy_gv_size, $real_gv_size + $incremental_gv_size - $gp_size,
       'GV copies point back to the real GV');
 }
@@ -101,21 +99,20 @@ sub gv_grew {
     cmp_ok($new_thing_size, '>', 0, "For $type, new item has a size");
 
     is($cv_now_size, $cv_was_size,
-       "Under multiplicity, the optree doesn't directly close onto a GV, so CVs won't change size")
-           if $Config{usemultiplicity};
+       "Under ithreads, the optree doesn't directly close onto a GV, so CVs won't change size")
+           if $Config{useithreads};
     if ($] < 5.010 && $type eq 'SCALAR') {
        is($cv_now_size, $cv_was_size, "CV doesn't grow as GV has SCALAR")
-           unless $Config{usemultiplicity};
+           unless $Config{useithreads};
        is($io_now_size, $io_was_size, "IO doesn't grow as GV has SCALAR");
        is($gv_now_size, $gv_was_size, 'GV size unchanged as GV has SCALAR');
-       local $TODO = 'total_size double counts GP entries';
        is($gv_now_total_size, $gv_was_total_size,
           'GV total size unchanged as GV has SCALAR');
     } elsif ($type eq 'CODE' || $type eq 'FORMAT') {
        # CV like things (effectively) close back over their typeglob, so its
        # hard to just get the size of the CV.
        cmp_ok($cv_now_size, '>', $cv_was_size, "CV grew for $type")
-           unless $Config{usemultiplicity};
+           unless $Config{useithreads};
        cmp_ok($io_now_size, '>', $io_was_size, "IO grew for $type");
        # Assigning CVs and FORMATs to typeglobs causes the typeglob to get
        # weak reference magic
@@ -125,12 +122,11 @@ sub gv_grew {
     } else {
        is($cv_now_size, $cv_was_size + $new_thing_size,
           "CV grew by expected amount for $type")
-                   unless $Config{usemultiplicity};
+                   unless $Config{useithreads};
        is($io_now_size, $io_was_size + $new_thing_size,
           "IO total_size grew by expected amount for $type");
        is($gv_now_size, $gv_was_size + $new_thing_size,
           "GV size grew by expected amount for $type");
-       local $TODO = 'total_size double counts GP entries';
        is($gv_now_total_size, $gv_was_total_size + $new_thing_size,
           "GV total_size grew by expected amount for $type");
     }