OpenSSL::Test: supported filtered command output

95-test_external_boringssl.t had a specialised run() variant to prefix
the command output so it wouldn't disturb Test::Harness.  This
functionality if now moved to the run() command, using the added
option 'prefix' that can be set to the string to prefix the output
with.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3201)

1 files changed, 5 insertions, 17 deletions

diff --git a/test/recipes/95-test_external_boringssl.t b/test/recipes/95-test_external_boringssl.t
index a49e6ea466..56505cf98b 100644
--- a/test/recipes/95-test_external_boringssl.t
+++ b/test/recipes/95-test_external_boringssl.t
@@ -22,22 +22,10 @@ plan skip_all => "BoringSSL runner not detected"
 plan tests => 1;
 
 indir $ENV{BORING_RUNNER_DIR} => sub {
-    ok(filter_run(cmd(["go", "test", "-shim-path",
-                       bldtop_file("test", "ossl_shim", "ossl_shim"),
-                       "-shim-config",
-                       srctop_file("test", "ossl_shim", "ossl_config.json"),
-                       "-pipe", "-allow-unimplemented"])),
+    ok(run(cmd(["go", "test", "-shim-path",
+                bldtop_file("test", "ossl_shim", "ossl_shim"),
+                "-shim-config",
+                srctop_file("test", "ossl_shim", "ossl_config.json"),
+                "-pipe", "-allow-unimplemented"]), prefix => "go test: "),
        "running BoringSSL tests");
 }, create => 0, cleanup => 0;
-
-# Filter the output so that the "ok" printed by go test doesn't confuse
-# Test::More. Without that it thinks there has been one more test run than was
-# planned
-sub filter_run {
-    my $cmd = cmdstr(shift);
-    open(PIPE, "-|", $cmd);
-    while(<PIPE>) {
-        print STDOUT "go test: ", $_;
-    }
-    close PIPE;
-}