Added plan, removed "done" where appropriate

Author: lizmat

S02-lexical-conventions/comments.t

@@ -3,6 +3,7 @@ use v6;
 # Test various forms of comments
 
 use Test;
+plan 51;
 
 # L<S02/"Embedded Comments"/"Embedded comments"
 #  "#" plus any bracket>
@@ -220,6 +221,4 @@ is $outerVal, 22, 'Single paragraph Pod, multiple lines parses to whitespace in
 
 }}, 'Single paragraph Pod, multiple lines eval throws no error' );
 
-done;
-
 # vim: ft=perl6

S02-literals/version.t

@@ -1,5 +1,6 @@
 use v6;
 use Test;
+plan 28;
 
 is v1.2.3, '1.2.3', 'version literal stringification';
 is v1.2.3+, '1.2.3+', 'version literal stringification';
@@ -30,6 +31,3 @@ is  v1.2   cmp  v1.10,  Less, "cmp isn't Stringy-based";
 ok  v1.2   eqv  v1.2.0, 'trailing zeroes are equivalent';
 ok  v1.2.0 eqv  v1.2,   'trailing zeroes are equivalent';
 ok  v1.2.0 eqv  v1.2.0.0.0.0.0,   'trailing zeroes are equivalent';
-
-done;
-

S02-magicals/78258.t

@@ -1,5 +1,5 @@
 use v6;
 
 use lib 't/spec/S02-magicals';
-use UsedEnv;
+use UsedEnv; # contains plan
 

S02-names-vars/perl.t

@@ -1,5 +1,6 @@
 use v6;
 use Test;
+plan 98;
 # L<S02/Names and Variables/To get a Perlish representation of any object>
 
 #?pugs emit plan 89;
@@ -199,6 +200,4 @@ my @tests = (
     is EVAL($a.perl).decode("utf8"), "asdf";
 }
 
-done;
-
 # vim: ft=perl6

S03-metaops/reduce.t

@@ -1,5 +1,6 @@
 use v6;
 use Test;
+plan 366;
 
 =begin pod
 
@@ -381,6 +382,4 @@ ok ([+]) == 0, 'argumentless [+] parses';
 {
     is(([X~] <a b>, <a b>, <a b>), <aaa aab aba abb baa bab bba bbb>, 'reduce with X');
 }
-
-done;
 # vim: ft=perl6

S03-operators/andthen.t

@@ -1,5 +1,6 @@
 use v6;
 use Test;
+plan 8;
 
 is (1 andthen 2), 2, 'andthen basics';
 is (1 andthen 2 andthen 3), 3, 'andthen chained';
@@ -11,6 +12,3 @@ nok (Int andthen ($tracker = 1)), 'sanity';
 nok $tracker, 'andthen thunks';
 
 my $ = 'some arg' andthen -> $x { is $x, 'some arg', 'andthen passes on arguments' };
-
-
-done;

S03-sequence/misc.t

@@ -1,5 +1,6 @@
 use v6;
 use Test;
+plan 19;
 
 
 # L<S03/List infix precedence/constraints implied by the signature of the function>
@@ -95,6 +96,4 @@ is (1, { $^n*2 + 1 } ... 31, *+5 ... { $^n**2 < 2000 }, 'a', *~'z' ... { $_.char
     is @rt80574[0], 'zero', 'Generator output is flattened';
 }
 
-done;
-
 # vim: ft=perl6

S03-smartmatch/any-sub.t

@@ -1,5 +1,6 @@
 use v6;
 use Test;
+plan 8;
 
 #L<S03/Smart matching/Any .(...) sub call truth>
 {
@@ -18,6 +19,4 @@ use Test;
     ok  (0 ~~ $sub),    '~~ sub call truth (-,2)';
 }
 
-done;
-
 # vim: ft=perl6

S04-declarations/constant.t

@@ -1,7 +1,7 @@
 use v6;
 
 use Test;
-
+plan 48;
 
 # L<S04/The Relationship of Blocks and Declarations/"The new constant declarator">
 
@@ -310,6 +310,4 @@ use Test;
     is B::a, 3, 'escaped constant declaration in class';
 }
 
-done;
-
 # vim: ft=perl6

S04-statements/if.t

@@ -2,6 +2,8 @@ use v6;
 
 use Test;
 
+plan 29;
+
 =begin kwid
 
 Basic "if" tests.
@@ -11,8 +13,6 @@ Basic "if" tests.
 
 # L<S04/Conditional statements>
 
-plan 29;
-
 my $x = 'test';
 if ($x eq $x) { pass('if ($x eq $x) {} works'); } else { flunk('if ($x eq $x) {} failed'); }
 if ($x ne $x) { flunk('if ($x ne $x) {} failed'); } else { pass('if ($x ne $x) {} works'); }