Corrections to 0511665b4b

- require './test.pl' in a BEGIN block, rather than use './test.pl'.
- Ensure the tests are done in the same program that emits the plan()
  otherwise one copy of test.pl thinks tests were planned but not done
  and the other thinks tests were done without being planned.
- Fix indentation.

2 files changed, 8 insertions, 6 deletions

diff --git a/t/win32/system.t b/t/win32/system.t
index b81c7abc79..a6a94cb51a 100644
--- a/t/win32/system.t
+++ b/t/win32/system.t
@@ -134,8 +134,8 @@ my $expect;
 my $comment = "";
 while (<$T>) {
     chomp;
-    if (/^1\.\./) {
-	print "$_\n";
+    if (s/^1\.\.//) {
+	plan $_;
     }
     elsif (/^#+\s(.*)$/) {
 	$comment = $1;
@@ -150,8 +150,8 @@ while (<$T>) {
 	    note $comment if $comment;
 	    note "want: $expect";
 	    note "got : $_";
-    }
-    ok($expect eq $_);
+	}
+	ok($expect eq $_);
     }
 }
 close $T;
diff --git a/t/win32/system_tests b/t/win32/system_tests
index 7d2eb1c063..e2445ed3a7 100644
--- a/t/win32/system_tests
+++ b/t/win32/system_tests
@@ -3,7 +3,9 @@
 use Config;
 use Cwd;
 use strict;
-use './test.pl';
+BEGIN {
+    require './test.pl';
+}
 
 $| = 1;
 
@@ -85,7 +87,7 @@ my @av = (
   ['" "', 'a" "b" "c', "abc"],
 );
 
-plan @commands * @av * 2;
+print "1.." . (@commands * @av * 2) . "\n";
 for my $cmds (@commands) {
     for my $args (@av) {
 	my @all_args;