From bd2155e948a1f239566e8f65cc87080f80b99240 Mon Sep 17 00:00:00 2001
From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 17 Dec 2001 19:18:52 +0000
Subject: [PATCH] Move typeglob test from glob.t to gv.t.

p4raw-id: //depot/perl@13742
---
 t/op/glob.t | 23 ++++++++++-------------
 t/op/gv.t   | 12 ++++++++++--
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/t/op/glob.t b/t/op/glob.t
index 1dd806e..96aab54 100755
--- a/t/op/glob.t
+++ b/t/op/glob.t
@@ -5,7 +5,7 @@ BEGIN {
     @INC = '../lib';
 }
 
-print "1..13\n";
+print "1..10\n";
 
 @oops = @ops = <op/*>;
 
@@ -53,20 +53,17 @@ for (1..2) {
 }
 print $i == 2 ? "ok 7\n" : "not ok 7\n";
 
-# [ID 20010526.001] localized glob loses value when assigned to
-
-$j=1; %j=(a=>1); @j=(1); local *j=*j; *j = sub{};
-
-print $j    == 1 ? "ok 8\n"  : "not ok 8\n";
-print $j{a} == 1 ? "ok 9\n"  : "not ok 9\n";
-print $j[0] == 1 ? "ok 10\n" : "not ok 10\n";
-
 # ... while ($var = glob(...)) should test definedness not truth
 
 # Create a file called "0"
-print open(F, ">0") ? "ok 11\n" : "not ok 11 # $!\n";
-my $ok = "not ok 12\n";
-$ok = "ok 12\n" while my $var = glob("0");
+print open(F, ">0") ? "ok 8\n" : "not ok 8 # $!\n";
+my $ok = "not ok 9\n";
+$ok = "ok 9\n" while my $var = glob("0");
 print $ok;
 
-print unlink("0") ? "ok 13\n" : "not ok 13\n";
+print unlink("0") ? "ok 10\n" : "not ok 10\n";
+
+END {
+    1 while unlink "0";
+}
+
diff --git a/t/op/gv.t b/t/op/gv.t
index a423cb4..9380735 100755
--- a/t/op/gv.t
+++ b/t/op/gv.t
@@ -11,7 +11,7 @@ BEGIN {
 
 use warnings;
 
-print "1..41\n";
+print "1..44\n";
 
 # type coersion on assignment
 $foo = 'foo';
@@ -177,6 +177,14 @@ print {*x{IO}} "ok 23\n";
 }
 
 
+# [ID 20010526.001] localized glob loses value when assigned to
+
+$j=1; %j=(a=>1); @j=(1); local *j=*j; *j = sub{};
+
+print $j    == 1 ? "ok 41\n"  : "not ok 41\n";
+print $j{a} == 1 ? "ok 42\n"  : "not ok 42\n";
+print $j[0] == 1 ? "ok 43\n" : "not ok 43\n";
+
 # does pp_readline() handle glob-ness correctly?
 
 {
@@ -186,4 +194,4 @@ print {*x{IO}} "ok 23\n";
 }
 
 __END__
-ok 41
+ok 44
-- 
2.7.4