Move 7 more tests

Author: jkeenan

t/op/goto-amp-name.t

@@ -11,8 +11,7 @@ use warnings;
 use strict;
 use Config;
 #plan tests => 'no_plan'; # yet
-#plan tests => 25;
-plan tests => 27;
+plan tests => 34;
 
 our $TODO;
 
@@ -61,6 +60,27 @@ our $foo;
 
 ###################
 
+# see if a modified @_ propagates
+{
+  my $i;
+  package Foo;
+  sub DESTROY	{ my $s = shift; ::is($s->[0], $i, "destroy $i"); }
+  sub show	{ ::is(+@_, 5, "show $i",); }
+  sub start	{ push @_, 1, "foo", {}; goto &show; }
+  for (1..3)	{ $i = $_; start(bless([$_]), 'bar'); }
+}
+
+sub auto {
+    goto &loadit;
+}
+my $ok;
+
+sub AUTOLOAD { $ok = 1 if "@_" eq "foo" }
+
+$ok = 0;
+auto("foo");
+ok($ok, 'autoload');
+
 # Test autoloading mechanism.
 
 sub two {

t/op/goto.t

@@ -13,8 +13,7 @@ use warnings;
 use strict;
 use Config;
 #plan tests => 134;
-#plan tests => 110;
-plan tests => 108;
+plan tests => 101;
 
 our $TODO;
 
@@ -81,7 +80,7 @@ fail('goto bypass');
 exit;
 
 FINALE:
-is(curr_test(), 18, 'FINALE');
+is(curr_test(), 11, 'FINALE');
 
 # does goto LABEL handle block contexts correctly?
 # note that this scope-hopping differs from last & next,
@@ -335,26 +334,6 @@ is(curr_test(), 9, 'eval "goto $x"');
     like($@, qr/Can't find label NOWHERE/, 'goto NOWHERE sets $@');
 }
 
-# see if a modified @_ propagates
-{
-  my $i;
-  package Foo;
-  sub DESTROY	{ my $s = shift; ::is($s->[0], $i, "destroy $i"); }
-  sub show	{ ::is(+@_, 5, "show $i",); }
-  sub start	{ push @_, 1, "foo", {}; goto &show; }
-  for (1..3)	{ $i = $_; start(bless([$_]), 'bar'); }
-}
-
-sub auto {
-    goto &loadit;
-}
-
-sub AUTOLOAD { $ok = 1 if "@_" eq "foo" }
-
-$ok = 0;
-auto("foo");
-ok($ok, 'autoload');
-
 {
     my $wherever = 'FINALE';
     goto $wherever;