From adcd8e37db682a5818415b1e0e1d8847dd9ab1e6 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Tue, 18 Apr 2017 16:33:15 -0400 Subject: Convert more tests ct_test,evp_extra_test,wpackettest,packettest Add strncmp TEST wrappers And make some style/consistency fixes to ct_test Silence travis; gcc bug? Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/3234) --- test/testutil.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'test/testutil.h') diff --git a/test/testutil.h b/test/testutil.h index 0631a8b7f8..e7478a8ade 100644 --- a/test/testutil.h +++ b/test/testutil.h @@ -189,6 +189,14 @@ int test_ptr_null(const char *file, int line, const char *s, const void *p); DECLARE_COMPARISON(char *, str, eq) DECLARE_COMPARISON(char *, str, ne) +/* + * Same as above, but for strncmp. + */ +int test_strn_eq(const char *file, int line, const char *, const char *, + const char *a, const char *b, size_t s); +int test_strn_ne(const char *file, int line, const char *, const char *, + const char *a, const char *b, size_t s); + /* * Equality test for memory blocks where NULL is a legitimate value. * These calls return 1 if the two memory blocks compare true. @@ -293,6 +301,8 @@ void test_info_c90(const char *desc, ...) PRINTF_FORMAT(1, 2); # define TEST_str_eq(a, b) test_str_eq(__FILE__, __LINE__, #a, #b, a, b) # define TEST_str_ne(a, b) test_str_ne(__FILE__, __LINE__, #a, #b, a, b) +# define TEST_strn_eq(a, b, n) test_strn_eq(__FILE__, __LINE__, #a, #b, a, b, n) +# define TEST_strn_ne(a, b, n) test_strn_ne(__FILE__, __LINE__, #a, #b, a, b, n) # define TEST_mem_eq(a, m, b, n) test_mem_eq(__FILE__, __LINE__, #a, #b, a, m, b, n) # define TEST_mem_ne(a, m, b, n) test_mem_ne(__FILE__, __LINE__, #a, #b, a, m, b, n) -- cgit v1.2.3