diff options
author | Richard Levitte <levitte@openssl.org> | 2017-03-10 20:42:12 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-03-10 22:13:04 +0100 |
commit | fb68fba05f1b43cc9715fdb99e573b000bdb7969 (patch) | |
tree | c11e806ade36f196e214477bfe728249389ffcce /test/recipes | |
parent | d3bc98058599a5feffbe68d4e5f2ca43a698d95b (diff) |
Encourage having external tests in multiple test recipes
This will make the individual external tests more easily selectable /
deselectable through the usual test selection mechanism.
This also moves external tests to group 95.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2902)
Diffstat (limited to 'test/recipes')
-rw-r--r-- | test/recipes/95-test_external_boringssl.t (renamed from test/recipes/90-test_external.t) | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/test/recipes/90-test_external.t b/test/recipes/95-test_external_boringssl.t index 3bdc4afe67..a49e6ea466 100644 --- a/test/recipes/90-test_external.t +++ b/test/recipes/95-test_external_boringssl.t @@ -11,24 +11,23 @@ use OpenSSL::Test; use OpenSSL::Test::Utils; use OpenSSL::Test qw/:DEFAULT bldtop_file srctop_file cmdstr/; -setup("test_external"); +setup("test_external_boringssl"); plan skip_all => "No external tests in this configuration" if disabled("external-tests"); -if (!$ENV{BORING_RUNNER_DIR}) { - plan skip_all => "No external tests have been detected"; -} +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"])), - "running external tests"); + bldtop_file("test", "ossl_shim", "ossl_shim"), + "-shim-config", + srctop_file("test", "ossl_shim", "ossl_config.json"), + "-pipe", "-allow-unimplemented"])), + "running BoringSSL tests"); }, create => 0, cleanup => 0; # Filter the output so that the "ok" printed by go test doesn't confuse |