From: Nicholas Clark <nick@ccl4.org>
Date: Sun, 24 Apr 2011 17:43:32 +0000 (+0100)
Subject: The optree holds pointers to GVs under multiplicity. It's ithreads that differs.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ce5e7c21ee5eb5beb9c08dcc9621abeca548778b;p=p5sagit%2FDevel-Size.git

The optree holds pointers to GVs under multiplicity. It's ithreads that differs.

Hence the tests that are conditional on the different behaviours should be
{unthreaded,multiplicity} vs {ithreads}, not
{unthreaded} vs {multiplicity,ithreads}
---

diff --git a/t/globs.t b/t/globs.t
index 0fecd46..d37826a 100644
--- a/t/globs.t
+++ b/t/globs.t
@@ -99,11 +99,11 @@ 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');
 	is($gv_now_total_size, $gv_was_total_size,
@@ -112,7 +112,7 @@ sub gv_grew {
 	# 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
@@ -122,7 +122,7 @@ 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,