Move 2 more tests

This movement affected the count in FINALE.

Author: jkeenan

t/op/goto-amp-name.t

@@ -11,7 +11,8 @@ use warnings;
 use strict;
 use Config;
 #plan tests => 'no_plan'; # yet
-plan tests => 25;
+#plan tests => 25;
+plan tests => 27;
 
 our $TODO;
 
@@ -60,6 +61,26 @@ our $foo;
 
 ###################
 
+# Test autoloading mechanism.
+
+sub two {
+    my ($pack, $file, $line) = caller;	# Should indicate original call stats.
+    is("@_ $pack $file $line", "1 2 3 main $::FILE $::LINE",
+	'autoloading mechanism.');
+}
+
+sub one {
+    eval <<'END';
+    no warnings 'redefine';
+    sub one { pass('sub one'); goto &two; fail('sub one tail'); }
+END
+    goto &one;
+}
+
+$::FILE = __FILE__;
+$::LINE = __LINE__ + 1;
+&one(1,2,3);
+
 # deep recursion with gotos eventually caused a stack reallocation
 # which messed up buggy internals that didn't expect the stack to move
 

t/op/goto.t

@@ -13,7 +13,8 @@ use warnings;
 use strict;
 use Config;
 #plan tests => 134;
-plan tests => 110;
+#plan tests => 110;
+plan tests => 108;
 
 our $TODO;
 
@@ -80,7 +81,7 @@ fail('goto bypass');
 exit;
 
 FINALE:
-is(curr_test(), 20, 'FINALE');
+is(curr_test(), 18, 'FINALE');
 
 # does goto LABEL handle block contexts correctly?
 # note that this scope-hopping differs from last & next,
@@ -328,26 +329,6 @@ bypass:
 
 is(curr_test(), 9, 'eval "goto $x"');
 
-# Test autoloading mechanism.
-
-sub two {
-    my ($pack, $file, $line) = caller;	# Should indicate original call stats.
-    is("@_ $pack $file $line", "1 2 3 main $::FILE $::LINE",
-	'autoloading mechanism.');
-}
-
-sub one {
-    eval <<'END';
-    no warnings 'redefine';
-    sub one { pass('sub one'); goto &two; fail('sub one tail'); }
-END
-    goto &one;
-}
-
-$::FILE = __FILE__;
-$::LINE = __LINE__ + 1;
-&one(1,2,3);
-
 {
     my $wherever = 'NOWHERE';
     eval { goto $wherever };