diff options
| author | Randall S. Becker <rsbecker@nexbridge.com> | 2020-09-06 16:37:47 -0500 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-09-12 20:32:11 +0200 |
| commit | 08073700cc50bcd0df5c0ee68c100e300a320d03 (patch) | |
| tree | 33e0641543cc32390ba73c49901183de01fdb9db /test | |
| parent | f0c62c53286b3a79cc059354a6d3425b35bb1d50 (diff) | |
NonStop port updates for 3.0.0.
HPE NonStop Port Changes for 3.0.0 Includes unthreaded, PUT, and SPT for OSS.
The port changes include wrapping where necessary for FLOSS and
appropriate configuration changes to support that. Two tests
are excluded as being inappropriate for the platform.
The changes are:
* Added /usr/local/include to nonstop-nsx_spt_floss to load floss.h
* Added SPT Floss variant for NonStop
* Wrapped FLOSS definitions in OPENSSL_TANDEM_FLOSS to allow selective enablement.
* SPT build configuration for NonStop
* Skip tests not relevant for NonStop
* PUT configuration changes required for NonStop platforms
* Configurations/50-nonstop.conf: updates for TNS/X platform.
* FLOSS instrumentation for HPE NonStop TNS/X and TNS/E platforms.
* Configurations/50-nonstop.conf: modifications for non-PUT TNS/E platform b
* Fix use of DELAY in ssltestlib.c for HPNS.
* Fixed commit merge issues and added floss to http_server.c
CLA: Permission is granted by the author to the OpenSSL team to use these modifications.
Fixes #5087.
Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12800)
Diffstat (limited to 'test')
| -rw-r--r-- | test/bntest.c | 3 | ||||
| -rw-r--r-- | test/drbgtest.c | 5 | ||||
| -rw-r--r-- | test/recipes/01-test_symbol_presence.t | 2 | ||||
| -rw-r--r-- | test/recipes/90-test_shlibload.t | 1 |
4 files changed, 11 insertions, 0 deletions
diff --git a/test/bntest.c b/test/bntest.c index 252bac4d8e..5ec35181f1 100644 --- a/test/bntest.c +++ b/test/bntest.c @@ -10,6 +10,9 @@ #include <errno.h> #include <stdio.h> #include <string.h> +#ifdef __TANDEM +# include <strings.h> /* strcasecmp */ +#endif #include <ctype.h> #include <openssl/bn.h> diff --git a/test/drbgtest.c b/test/drbgtest.c index d069460cd5..2ded33aa7f 100644 --- a/test/drbgtest.c +++ b/test/drbgtest.c @@ -31,6 +31,11 @@ # include <windows.h> #endif +#if defined(__TANDEM) +# if defined(OPENSSL_TANDEM_FLOSS) +# include <floss.h(floss_fork)> +# endif +#endif #if defined(OPENSSL_SYS_UNIX) # include <sys/types.h> diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t index d339770b0f..f22133d9d2 100644 --- a/test/recipes/01-test_symbol_presence.t +++ b/test/recipes/01-test_symbol_presence.t @@ -17,6 +17,8 @@ setup("test_symbol_presence"); plan skip_all => "Only useful when building shared libraries" if disabled("shared"); +plan skip_all => "Test is disabled on NonStop" if config('target') =~ m|^nonstop|; + my @libnames = ("crypto", "ssl"); my $testcount = scalar @libnames; diff --git a/test/recipes/90-test_shlibload.t b/test/recipes/90-test_shlibload.t index fee56cd254..96e3e6e12e 100644 --- a/test/recipes/90-test_shlibload.t +++ b/test/recipes/90-test_shlibload.t @@ -21,6 +21,7 @@ use platform; plan skip_all => "Test only supported in a shared build" if disabled("shared"); plan skip_all => "Test is disabled on AIX" if config('target') =~ m|^aix|; +plan skip_all => "Test is disabled on NonStop" if config('target') =~ m|^nonstop|; plan skip_all => "Test only supported in a dso build" if disabled("dso"); plan tests => 10; |