From 7d930974c0c5588a8872f30b83d6bc429106f825 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 23 Jan 2025 23:07:32 +0100 Subject: [PATCH] CONC-751 unit.conc_connection fails with CYPHER missmatch on some builds disable the test for old gnutls --- unittest/libmariadb/connection.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c index aff5b65f..90edc6f6 100644 --- a/unittest/libmariadb/connection.c +++ b/unittest/libmariadb/connection.c @@ -1966,7 +1966,8 @@ static int test_conc632(MYSQL *my __attribute__((unused))) return OK; } -#if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) +#if defined(HAVE_GNUTLS) && GNUTLS_VERSION_NUMBER >= 0x030700 || defined(HAVE_OPENSSL) +#define HAVE_test_conc748 static int test_conc748(MYSQL *my __attribute__((unused))) { MYSQL *mysql; @@ -2048,7 +2049,7 @@ static int test_conc589(MYSQL *my) struct my_tests_st my_tests[] = { {"test_conc589", test_conc589, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, -#if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) +#ifdef HAVE_test_conc748 {"test_conc748", test_conc748, TEST_CONNECTION_NONE, 0, NULL, NULL}, #endif {"test_conc632", test_conc632, TEST_CONNECTION_NONE, 0, NULL, NULL},