diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-05-27 12:10:52 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-05-28 14:18:13 +1000 |
| commit | 3d518d3d813da40195ff9fe5f4567ab9f09ddcc9 (patch) | |
| tree | 2d215454bd259c4eff3f37dc19ec9e573838df28 /test/errtest.c | |
| parent | bac8d066a595454e3f4a75e6e155a9d5b99ce4ea (diff) | |
Fix errtest for older compilers
Some older compilers use "unknown function" if they dont support __func, so the
test using ERR_PUT_error needed to compensate for this when comparing against the
expected value.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11967)
Diffstat (limited to 'test/errtest.c')
| -rw-r--r-- | test/errtest.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/errtest.c b/test/errtest.c index cc2f6612d1..9adf4ca917 100644 --- a/test/errtest.c +++ b/test/errtest.c @@ -10,6 +10,7 @@ #include <string.h> #include <openssl/opensslconf.h> #include <openssl/err.h> +#include <openssl/macros.h> #include "testutil.h" @@ -24,17 +25,20 @@ static int test_print_error_format(void) { - static const char expected[] = - ":error::system library:test_print_error_format:Operation not permitted:" + static const char expected_format[] = + ":error::system library:%s:Operation not permitted:" # ifndef OPENSSL_NO_FILENAMES "errtest.c:30:"; # else ":0:"; # endif + char expected[256]; char *out = NULL, *p = NULL; int ret = 0, len; BIO *bio = NULL; + BIO_snprintf(expected, sizeof(expected), expected_format, OPENSSL_FUNC); + if (!TEST_ptr(bio = BIO_new(BIO_s_mem()))) return 0; |