Move 4 more tests

Disambiguate variable

'$ok' is used several times within this file.  It gets confusing.
Rename one instance.

Author: jkeenan

t/op/goto-amp-name.t

@@ -11,7 +11,7 @@ use warnings;
 use strict;
 use Config;
 #plan tests => 'no_plan'; # yet
-plan tests => 35;
+plan tests => 39;
 
 our $TODO;
 
@@ -60,6 +60,64 @@ our $foo;
 
 ###################
 
+# bug #9990 - don't prematurely free the CV we're &going to.
+
+sub f1 {
+    my $x;
+    goto sub { $x=0; ok(1,"don't prematurely free CV\n") }
+}
+f1();
+
+# bug #99850, which is similar - freeing the subroutine we are about to
+# go(in)to during a FREETMPS call should not crash perl.
+
+package _99850 {
+    sub reftype{}
+    DESTROY { undef &reftype }
+    eval { sub { my $guard = bless []; goto &reftype }->() };
+}
+like $@, qr/^Goto undefined subroutine &_99850::reftype at /,
+   'goto &foo undefining &foo on sub cleanup';
+
+# When croaking after discovering that the new CV you're about to goto is
+# undef, make sure that the old CV isn't doubly freed.
+
+package Do_undef {
+    my $count;
+
+    # creating a new closure here encourages any prematurely freed
+    # CV to be reallocated
+    sub DESTROY { undef &undef_sub; my $x = sub { $count } }
+
+    sub f {
+        $count++;
+        my $guard = bless []; # trigger DESTROY during goto
+        *undef_sub = sub {};
+        goto &undef_sub
+    }
+
+    for (1..10) {
+        eval { f() };
+    }
+    ::is($count, 10, "goto undef_sub safe");
+}
+
+# make sure that nothing nasty happens if the old CV is freed while
+# goto'ing
+
+package Free_cv {
+    my $results;
+    sub f {
+        no warnings 'redefine';
+        *f = sub {};
+        goto &g;
+    }
+    sub g { $results = "(@_)" }
+
+    f(1,2,3);
+    ::is($results, "(1 2 3)", "Free_cv");
+}
+
 # [perl #29708] - goto &foo could leave foo() at depth two with
 # @_ == PL_sv_undef, causing a coredump
 

t/op/goto.t

@@ -13,7 +13,7 @@ use warnings;
 use strict;
 use Config;
 #plan tests => 134;
-plan tests => 100;
+plan tests => 96;
 
 our $TODO;
 
@@ -59,16 +59,16 @@ is($foo, 4, 'second escape while loop');
 my $r = run_perl(prog => 'goto foo;', stderr => 1);
 like($r, qr/label/, 'cant find label');
 
-my $ok = 0;
+my $thisok = 0;
 sub foo {
     goto bar;
     return;
 bar:
-    $ok = 1;
+    $thisok = 1;
 }
 
 &foo;
-ok($ok, 'goto in sub');
+ok($thisok, 'goto in sub');
 
 sub bar {
     my $x = 'bypass';
@@ -139,7 +139,7 @@ FORL2: for($y=1; 1;) {
 
 # Does goto work correctly within a try block?
 #  (BUG ID 20000313.004) - [perl #2359]
-$ok = 0;
+my $ok = 0;
 eval {
   my $variable = 1;
   goto LABEL20;
@@ -208,65 +208,6 @@ ok($ok, 'works correctly in a nested eval string');
     $deprecated = 0;
 }
 
-# bug #9990 - don't prematurely free the CV we're &going to.
-
-sub f1 {
-    my $x;
-    goto sub { $x=0; ok(1,"don't prematurely free CV\n") }
-}
-f1();
-
-# bug #99850, which is similar - freeing the subroutine we are about to
-# go(in)to during a FREETMPS call should not crash perl.
-
-package _99850 {
-    sub reftype{}
-    DESTROY { undef &reftype }
-    eval { sub { my $guard = bless []; goto &reftype }->() };
-}
-like $@, qr/^Goto undefined subroutine &_99850::reftype at /,
-   'goto &foo undefining &foo on sub cleanup';
-
-# When croaking after discovering that the new CV you're about to goto is
-# undef, make sure that the old CV isn't doubly freed.
-
-package Do_undef {
-    my $count;
-
-    # creating a new closure here encourages any prematurely freed
-    # CV to be reallocated
-    sub DESTROY { undef &undef_sub; my $x = sub { $count } }
-
-    sub f {
-        $count++;
-        my $guard = bless []; # trigger DESTROY during goto
-        *undef_sub = sub {};
-        goto &undef_sub
-    }
-
-    for (1..10) {
-        eval { f() };
-    }
-    ::is($count, 10, "goto undef_sub safe");
-}
-
-# make sure that nothing nasty happens if the old CV is freed while
-# goto'ing
-
-package Free_cv {
-    my $results;
-    sub f {
-        no warnings 'redefine';
-        *f = sub {};
-        goto &g;
-    }
-    sub g { $results = "(@_)" }
-
-    f(1,2,3);
-    ::is($results, "(1 2 3)", "Free_cv");
-}
-
-
 # bug #22181 - this used to coredump or make $x undefined, due to
 # erroneous popping of the inner BLOCK context