From b9a758060dfe8f1bd11265b1c1550a27cd2c0783 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 7 Aug 2019 09:47:43 +0100 Subject: [PATCH] Fix no-filenames If built with no-filenames then we shouldn't test this functionality in the test suite. Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/9544) --- test/errtest.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/errtest.c b/test/errtest.c index 95c52427e4..37e9686663 100644 --- a/test/errtest.c +++ b/test/errtest.c @@ -47,19 +47,24 @@ static int vdata_appends(void) /* Test that setting a platform error sets the right values. */ static int platform_error(void) { - const char *file, *f, *data; - int line; + const char *f, *data; int l; unsigned long e; +#ifndef OPENSSL_NO_FILENAMES + const char *file; + int line; file = __FILE__; - line = __LINE__ + 1; /* The error is generated on the next line */ + line = __LINE__ + 2; /* The error is generated on the ERR_raise_data line */ +#endif ERR_raise_data(ERR_LIB_SYS, ERR_R_INTERNAL_ERROR, "calling exit()"); if (!TEST_ulong_ne(e = ERR_get_error_line_data(&f, &l, &data, NULL), 0) || !TEST_int_eq(ERR_GET_REASON(e), ERR_R_INTERNAL_ERROR) +#ifndef OPENSSL_NO_FILENAMES || !TEST_int_eq(l, line) || !TEST_str_eq(f, file) +#endif || !TEST_str_eq(data, "calling exit()")) return 0; return 1; -- GitLab