Integrate (by hand) change #18386 from maint-5.8

p4raw-link: @18386 on //depot/maint-5.8/perl: ae482bddc28bdefe6941bbd8dd2654bdbf1d93be

p4raw-id: //depot/perl@18900

1 files changed, 8 insertions, 9 deletions

diff --git a/t/op/split.t b/t/op/split.t
index 3d7e89880b..55b2839b0c 100755
--- a/t/op/split.t
+++ b/t/op/split.t
@@ -6,7 +6,7 @@ BEGIN {
     require './test.pl';
 }
 
-plan tests => 50;
+plan tests => 52;
 
 $FS = ':';
 
@@ -265,15 +265,14 @@ ok(@ary == 3 &&
 
 {
     # [perl #18195]
-    for my $a (0,1) {
-	$_ = 'readin,database,readout';
-	if ($ARGV[0])  {
-	    $_ .= chr 256;
-	    chop;
+    for my $u (0, 1) {
+	for my $a (0, 1) {
+	    $_ = 'readin,database,readout';
+	    utf8::upgrade $_ if $u;
+	    /(.+)/;
+	    my @d = split /[,]/,$1;
+	    is(join (':',@d), 'readin:database:readout', "[perl #18195]");
 	}
-	/(.+)/;
-	my @d = split /[,]/,$1;
-	is(join (':',@d), 'readin:database:readout', "[perl #18195]")
     }
 }