Commit d5df08af authored by Richard Levitte's avatar Richard Levitte Committed by Matt Caswell
Browse files

Convert 90-test_external.t to using "executable" rather than "system" 



Use the newly added "executable" function rather than "system". Also filter
the output to add a prefix to every line so that the "ok" doesn't confuse
Test::More

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent ce2596d4

test/recipes/90-test_external.t

+16 −6
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


use OpenSSL::Test;

use OpenSSL::Test::Utils;

use OpenSSL::Test qw/:DEFAULT srctop_file/;

use OpenSSL::Test qw/:DEFAULT srctop_file cmdstr/;



setup("test_external");
@@ -20,9 +20,19 @@ if (!$ENV{BORING_RUNNER_DIR}) { 
plan tests => 1;



indir $ENV{BORING_RUNNER_DIR} => sub {

    ok(!system("go", "test", "-shim-path",

    ok(filter_run(executable(["go", "test", "-shim-path",

                              srctop_file("test", "ossl_shim", "ossl_shim"),

                              "-shim-config",

               srctop_file("test", "ossl_shim", "ossl_config.json"), "-pipe"),

       "running external tests");

                              srctop_file("test", "ossl_shim",

                                          "ossl_config.json"),

                              "-pipe"])),

}, create => 0, cleanup => 0;



sub filter_run {

    my $cmd = cmdstr(shift);

    open(PIPE, "-|", $cmd);

    while(<PIPE>) {

        print STDOUT "go test: ", $_;

    }

    close PIPE;

}