root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Richard Levitte 2017-03-10 20:42:12 +01:00
parent d3bc980585
commit fb68fba05f
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/README.external
View File

@ -1,13 +1,17 @@
Running the BoringSSL test suite with OpenSSL Running external test suites with OpenSSL
============================================= =========================================
It is possible to integrate external test suites into OpenSSL's "make test". At
the current time the only supported external suite is the one used by
BoringSSL.
It is possible to integrate external test suites into OpenSSL's "make test".
This capability is considered a developer option and may not work on all This capability is considered a developer option and may not work on all
platforms. platforms.
At the current time the only supported external suite is the one used by
BoringSSL.
The BoringSSL test suite
========================
In order to run the BoringSSL tests with OpenSSL, first checkout the BoringSSL In order to run the BoringSSL tests with OpenSSL, first checkout the BoringSSL
source code into an appropriate directory: source code into an appropriate directory:
@ -40,11 +44,11 @@ To see more detailed output you can run just the BoringSSL tests with the
verbose option: verbose option:
$ VERBOSE=1 BORING_RUNNER_DIR=/path/to/boringssl/ssl/test/runner make \ $ VERBOSE=1 BORING_RUNNER_DIR=/path/to/boringssl/ssl/test/runner make \
TESTS="test_external" test TESTS="test_external_boringssl" test
Test failures and suppressions Test failures and suppressions
============================== ------------------------------
A large number of the BoringSSL tests are known to fail. A test could fail A large number of the BoringSSL tests are known to fail. A test could fail
because of many possible reasons. For example: because of many possible reasons. For example:

17
test/recipes/90-test_external.t → test/recipes/95-test_external_boringssl.t
View File

@ -11,24 +11,23 @@ use OpenSSL::Test;
use OpenSSL::Test::Utils; use OpenSSL::Test::Utils;
use OpenSSL::Test qw/:DEFAULT bldtop_file srctop_file cmdstr/; 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" plan skip_all => "No external tests in this configuration"
if disabled("external-tests"); if disabled("external-tests");
if (!$ENV{BORING_RUNNER_DIR}) { plan skip_all => "BoringSSL runner not detected"
plan skip_all => "No external tests have been detected"; if !$ENV{BORING_RUNNER_DIR};
}
plan tests => 1; plan tests => 1;
indir $ENV{BORING_RUNNER_DIR} => sub { indir $ENV{BORING_RUNNER_DIR} => sub {
ok(filter_run(cmd(["go", "test", "-shim-path", ok(filter_run(cmd(["go", "test", "-shim-path",
bldtop_file("test", "ossl_shim", "ossl_shim"), bldtop_file("test", "ossl_shim", "ossl_shim"),
"-shim-config", "-shim-config",
srctop_file("test", "ossl_shim", "ossl_config.json"), srctop_file("test", "ossl_shim", "ossl_config.json"),
"-pipe", "-allow-unimplemented"])), "-pipe", "-allow-unimplemented"])),
"running external tests"); "running BoringSSL tests");
}, create => 0, cleanup => 0; }, create => 0, cleanup => 0;
# Filter the output so that the "ok" printed by go test doesn't confuse # Filter the output so that the "ok" printed by go test doesn't confuse