summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-10-14 15:52:50 +0100
committerMatt Caswell <matt@openssl.org>2016-11-04 10:38:54 +0000
commitd5df08afb43d66c26a512093c22a70d3a079dc3f (patch)
tree0cf32df9dd249349c72e6058f8f4e5a604276cd0
parentce2596d404c16266b6bd5614b2d5159b67054d58 (diff)
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: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
-rw-r--r--test/recipes/90-test_external.t22
1 files changed, 16 insertions, 6 deletions
diff --git a/test/recipes/90-test_external.t b/test/recipes/90-test_external.t
index eb42ac12ff..d08d66faad 100644
--- a/test/recipes/90-test_external.t
+++ b/test/recipes/90-test_external.t
@@ -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",
- srctop_file("test", "ossl_shim", "ossl_shim"),
- "-shim-config",
- srctop_file("test", "ossl_shim", "ossl_config.json"), "-pipe"),
- "running external tests");
+ 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"])),
}, create => 0, cleanup => 0;
+
+sub filter_run {
+ my $cmd = cmdstr(shift);
+ open(PIPE, "-|", $cmd);
+ while(<PIPE>) {
+ print STDOUT "go test: ", $_;
+ }
+ close PIPE;
+}