wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix no-filenames

Browse source 
If built with no-filenames then we shouldn't test this functionality in
the test suite.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/9544)
This commit is contained in:
Matt Caswell 2019-08-07 09:47:43 +01:00
parent f92e0815b8
commit b9a758060d
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/errtest.c
View file

@ -47,19 +47,24 @@ static int vdata_appends(void)
/* Test that setting a platform error sets the right values. */ /* Test that setting a platform error sets the right values. */
static int platform_error(void) static int platform_error(void)
{ {
const char *file, *f, *data; const char *f, *data;
int line;
int l; int l;
unsigned long e; unsigned long e;
#ifndef OPENSSL_NO_FILENAMES
const char *file;
int line;
file = __FILE__; 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, ERR_raise_data(ERR_LIB_SYS, ERR_R_INTERNAL_ERROR,
"calling exit()"); "calling exit()");
if (!TEST_ulong_ne(e = ERR_get_error_line_data(&f, &l, &data, NULL), 0) 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) || !TEST_int_eq(ERR_GET_REASON(e), ERR_R_INTERNAL_ERROR)
#ifndef OPENSSL_NO_FILENAMES
|| !TEST_int_eq(l, line) || !TEST_int_eq(l, line)
|| !TEST_str_eq(f, file) || !TEST_str_eq(f, file)
#endif
|| !TEST_str_eq(data, "calling exit()")) || !TEST_str_eq(data, "calling exit()"))
return 0; return 0;
return 1; return 1;