Avoid using ++, op= and anon hash constructors in the testing code.

{} could be misparsed, ++ has a lot of internal implementation "magic" that we
don't need, but don't want to trip us up if it isn't working, and op= isn't
necessary when we already rely on the more general $a = $b op $c working.

1 files changed, 24 insertions, 17 deletions

diff --git a/t/test.pl b/t/test.pl
index 830223677b..ca63a765b0 100644
--- a/t/test.pl
+++ b/t/test.pl
@@ -99,7 +99,7 @@ sub _ok {
 	$out = $pass ? "ok $test" : "not ok $test";
     }
 
-    $out .= " # TODO $TODO" if $TODO;
+    $out = $out . " # TODO $TODO" if $TODO;
     _print "$out\n";
 
     unless ($pass) {
@@ -153,13 +153,13 @@ sub display {
             my $y = '';
             foreach my $c (unpack("U*", $x)) {
                 if ($c > 255) {
-                    $y .= sprintf "\\x{%x}", $c;
+                    $y = $y . sprintf "\\x{%x}", $c;
                 } elsif ($backslash_escape{$c}) {
-                    $y .= $backslash_escape{$c};
+                    $y = $y . $backslash_escape{$c};
                 } else {
                     my $z = chr $c; # Maybe we can get away with a literal...
                     $z = sprintf "\\%03o", $c if $z =~ /[[:^print:]]/;
-                    $y .= $z;
+                    $y = $y . $z;
                 }
             }
             $x = $y;
@@ -415,7 +415,7 @@ sub _quote_args {
 	# In VMS protect with doublequotes because otherwise
 	# DCL will lowercase -- unless already doublequoted.
        $_ = q(").$_.q(") if $is_vms && !/^\"/ && length($_) > 0;
-	$$runperl .= ' ' . $_;
+       $$runperl = $$runperl . ' ' . $_;
     }
 }
 
@@ -430,7 +430,7 @@ sub _create_runperl { # Create the string to qx in runperl().
 	$runperl = "$ENV{PERL_RUNPERL_DEBUG} $runperl";
     }
     unless ($args{nolib}) {
-	$runperl .= ' "-I../lib"'; # doublequotes because of VMS
+	$runperl = $runperl . ' "-I../lib"'; # doublequotes because of VMS
     }
     if ($args{switches}) {
 	local $Level = 2;
@@ -448,14 +448,14 @@ sub _create_runperl { # Create the string to qx in runperl().
 	    unless ref $args{progs} eq "ARRAY";
         foreach my $prog (@{$args{progs}}) {
             if ($is_mswin || $is_netware || $is_vms) {
-                $runperl .= qq ( -e "$prog" );
+                $runperl = $runperl . qq ( -e "$prog" );
             }
             else {
-                $runperl .= qq ( -e '$prog' );
+                $runperl = $runperl . qq ( -e '$prog' );
             }
         }
     } elsif (defined $args{progfile}) {
-	$runperl .= qq( "$args{progfile}");
+	$runperl = $runperl . qq( "$args{progfile}");
     } else {
 	# You probaby didn't want to be sucking in from the upstream stdin
 	die "test.pl:runperl(): none of prog, progs, progfile, args, "
@@ -481,7 +481,7 @@ sub _create_runperl { # Create the string to qx in runperl().
     if (defined $args{args}) {
 	_quote_args(\$runperl, $args{args});
     }
-    $runperl .= ' 2>&1' if $args{stderr};
+    $runperl = $runperl . ' 2>&1' if $args{stderr};
     if ($args{verbose}) {
 	my $runperldisplay = $runperl;
 	$runperldisplay =~ s/\n/\n\#/g;
@@ -521,7 +521,7 @@ sub runperl {
 	    join $sep, grep { $_ ne "" and $_ ne "." and -d $_ and
 		($is_mswin or $is_vms or !(stat && (stat _)[2]&0022)) }
 		    split quotemeta ($sep), $1;
-	$ENV{PATH} .= "$sep/bin" if $is_cygwin;  # Must have /bin under Cygwin
+	$ENV{PATH} = $ENV{PATH} . "$sep/bin" if $is_cygwin;  # Must have /bin under Cygwin
 
 	$runperl =~ /(.*)/s;
 	$runperl = $1;
@@ -576,7 +576,7 @@ sub which_perl {
 	# the command.
 
 	if ($Perl !~ /\Q$exe\E$/i) {
-	    $Perl .= $exe;
+	    $Perl = $Perl . $exe;
 	}
 
 	warn "which_perl: cannot find $Perl from $^X" unless -f $Perl;
@@ -608,14 +608,14 @@ sub tempfile {
 	my $temp = $count;
 	my $try = "tmp$$";
 	do {
-	    $try .= $letters[$temp % 26];
+	    $try = $try . $letters[$temp % 26];
 	    $temp = int ($temp / 26);
 	} while $temp;
 	# Need to note all the file names we allocated, as a second request may
 	# come before the first is created.
 	if (!-e $try && !$tmpfiles{$try}) {
 	    # We have a winner
-	    $tmpfiles{$try}++;
+	    $tmpfiles{$try} = 1;
 	    return $try;
 	}
 	$count = $count + 1;
@@ -637,7 +637,14 @@ my $tmpfile = tempfile();
 sub _fresh_perl {
     my($prog, $resolve, $runperl_args, $name) = @_;
 
-    $runperl_args ||= {};
+    # Given the choice of the mis-parsable {}
+    # (we want an anon hash, but a borked lexer might think that it's a block)
+    # or relying on taking a reference to a lexical
+    # (\ might be mis-parsed, and the reference counting on the pad may go
+    #  awry)
+    # it feels like the least-worse thing is to assume that auto-vivification
+    # works. At least, this is only going to be a run-time failure, so won't
+    # affect tests using this file but not this function.
     $runperl_args->{progfile} = $tmpfile;
     $runperl_args->{stderr} = 1;
 
@@ -686,7 +693,7 @@ sub _fresh_perl {
     # Use the first line of the program as a name if none was given
     unless( $name ) {
         ($first_line, $name) = $prog =~ /^((.{1,50}).*)/;
-        $name .= '...' if length $first_line > length $name;
+        $name = $name . '...' if length $first_line > length $name;
     }
 
     _ok($pass, _where(), "fresh_perl - $name");
@@ -891,7 +898,7 @@ sub watchdog ($)
                 # Execute the timeout
                 my $time_left = $timeout;
                 do {
-                    $time_left -= sleep($time_left);
+                    $time_left = $time_left - sleep($time_left);
                 } while ($time_left > 0);
 
                 # Kill the parent (and ourself)