bk commit into 5.0 tree (msvensson:1.2585)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-06 15:47:13+01:00, msvensson@stripped +1 -0
  Remove slurp mode in test

  mysql-test/lib/t/SafeProcess.t@stripped, 2007-11-06 15:47:12+01:00, msvensson@stripped
+7 -7
    Remove slurp mode in test

diff -Nrup a/mysql-test/lib/t/SafeProcess.t b/mysql-test/lib/t/SafeProcess.t
--- a/mysql-test/lib/t/SafeProcess.t	2007-11-05 16:25:07 +01:00
+++ b/mysql-test/lib/t/SafeProcess.t	2007-11-06 15:47:12 +01:00
@@ -75,11 +75,12 @@ my $perl_path= $^X;
 
   $proc->wait_one(2); # Wait max 2 seconds for the process to finish
 
-  local undef $/; # Slurp
   my $fh= IO::File->new("$dir/output.txt");
-  ok(<$fh> =~ /Hello stdout/, "check stdout");
+  my @text= <$fh>;
+  ok(grep(/Hello stdout/, @text), "check stdout");
   $fh= IO::File->new("$dir/error.txt");
-  ok(<$fh> =~ /Hello stderr/, "check stderr");
+  my @text= <$fh>;
+  ok(grep(/Hello stderr/, @text), "check stderr");
 
   # To same file
   $proc= My::SafeProcess->new
@@ -93,10 +94,9 @@ my $perl_path= $^X;
 
   $proc->wait_one(2); # Wait max 2 seconds for the process to finish
 
-  $fh= IO::File->new("$dir/output.txt");
-  local undef $/; # Slurp
-  my $text= <$fh>;
-  ok($text =~ /Hello stdout/ and $text =~ /Hello stderr/,
+  my $fh= IO::File->new("$dir/output.txt");
+  my @text= <$fh>;
+  ok((grep(/Hello stdout/, @text) and grep(/Hello stderr/, @text)),
      "check stdout and stderr");
 
 }