replace nqp::openpipe by nqp::shell in tests

Author: FROGGS

t/nqp/86-pipes.t

@@ -1,18 +1,19 @@
 #! nqp
 
-# Testing nqp::openpipe.
+# Testing nqp::shell wrt capturing output.
 
-plan(16);
+plan(11);
 
 my $read_out         := nqp::const::PIPE_INHERIT_IN + nqp::const::PIPE_CAPTURE_OUT + nqp::const::PIPE_INHERIT_ERR;
 my $read_out_and_err := nqp::const::PIPE_INHERIT_IN + nqp::const::PIPE_CAPTURE_OUT + nqp::const::PIPE_CAPTURE_ERR;
 
 {
-    my $in  := nqp::syncpipe();
+    my $in  := nqp::null();
     my $out := nqp::syncpipe();
-    my $err := nqp::syncpipe();
-    my $pid := nqp::openpipe('echo aardvarks', nqp::cwd(), nqp::getenvhash(), $in, $out, $err, $read_out);
-    ok( $pid, 'nqp::openpipe' );
+    my $err := nqp::null();
+    nqp::setinputlinesep($out, "\n");
+    nqp::setencoding($out, 'utf8');
+    nqp::shell('echo aardvarks', nqp::cwd(), nqp::getenvhash(), $in, $out, $err, $read_out);
 
     my $pstr := nqp::readallfh($out);
     ok( $pstr ~~ / 'aardvarks' /, 'nqp::readallfh with a pipe');
@@ -23,11 +24,14 @@ my $read_out_and_err := nqp::const::PIPE_INHERIT_IN + nqp::const::PIPE_CAPTURE_O
 }
 
 {
-    my $in  := nqp::syncpipe();
+    my $in  := nqp::null();
     my $out := nqp::syncpipe();
     my $err := nqp::syncpipe();
-    my $pid := nqp::openpipe('doesnotexist', nqp::cwd(), nqp::getenvhash(), $in, $out, $err, $read_out_and_err);
-    ok( $pid, 'nqp::openpipe nonexistent cmd');
+    nqp::setinputlinesep($out, "\n");
+    nqp::setinputlinesep($err, "\n");
+    nqp::setencoding($out, 'utf8');
+    nqp::setencoding($err, 'utf8');
+    nqp::shell('doesnotexist', nqp::cwd(), nqp::getenvhash(), $in, $out, $err, $read_out_and_err);
 
     my $str_out := nqp::readallfh($out);
     my $str_err := nqp::readallfh($err);
@@ -41,11 +45,12 @@ my $read_out_and_err := nqp::const::PIPE_INHERIT_IN + nqp::const::PIPE_CAPTURE_O
 
 # same tests but do nqp::closefh_i instead of nqp::closefh
 {
-    my $in  := nqp::syncpipe();
+    my $in  := nqp::null();
     my $out := nqp::syncpipe();
-    my $err := nqp::syncpipe();
-    my $pid := nqp::openpipe('echo aardvarks', nqp::cwd(), nqp::getenvhash(), $in, $out, $err, $read_out);
-    ok( $pid, 'nqp::openpipe' );
+    my $err := nqp::null();
+    nqp::setinputlinesep($out, "\n");
+    nqp::setencoding($out, 'utf8');
+    nqp::shell('echo aardvarks', nqp::cwd(), nqp::getenvhash(), $in, $out, $err, $read_out);
 
     my $str := nqp::readallfh($out);
     ok( $str ~~ / 'aardvarks' /, 'nqp::readallfh with a pipe');
@@ -55,19 +60,20 @@ my $read_out_and_err := nqp::const::PIPE_INHERIT_IN + nqp::const::PIPE_CAPTURE_O
 }
 
 {
-    my $in  := nqp::syncpipe();
+    my $in  := nqp::null();
     my $out := nqp::syncpipe();
     my $err := nqp::syncpipe();
-    my $pid := nqp::openpipe('doesnotexist', nqp::cwd(), nqp::getenvhash(), $in, $out, $err, $read_out_and_err);
-    ok( $pid, 'nqp::openpipe nonexistent cmd');
+    nqp::setinputlinesep($out, "\n");
+    nqp::setinputlinesep($err, "\n");
+    nqp::setencoding($out, 'utf8');
+    nqp::setencoding($err, 'utf8');
+    nqp::shell('doesnotexist', nqp::cwd(), nqp::getenvhash(), $in, $out, $err, $read_out_and_err);
 
     my $str_out := nqp::readallfh($out);
     my $str_err := nqp::readallfh($err);
     nqp::getcomp('nqp').backend.name eq 'parrot' ??
         ok( $str_out ~~ / 'doesnotexist' /, 'nqp::readallfh with a pipe nonexistent command') !!
         ok( $str_out eq '' && $str_err ~~ / 'doesnotexist' /, 'nqp::readallfh with a pipe nonexistent command');
 
-    # Only the first call to closefh_i returns the exit code.
     ok( nqp::closefh_i($out) != 0, 'nqp::closefh_i with a pipe nonexistent command');
-    ok( nqp::closefh_i($err) == 0, 'nqp::closefh_i with a pipe nonexistent command');
 }