Fix MSVC warning C4819
[openssl.git] / test / recipes / 95-test_external_boringssl.t
index a49e6ea466eb07e2c190d9ce2e01bcb259ee0d0f..5e3f67edbe7490574507d085770ce4540627ff14 100644 (file)
@@ -15,29 +15,16 @@ setup("test_external_boringssl");
 
 plan skip_all => "No external tests in this configuration"
     if disabled("external-tests");
-
 plan skip_all => "BoringSSL runner not detected"
     if !$ENV{BORING_RUNNER_DIR};
 
 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;
-}