You've already forked mariadb-connector-c
mirror of
https://github.com/mariadb-corporation/mariadb-connector-c.git
synced 2025-08-07 02:42:49 +03:00
unittest fix:
Added macro SKIP_NOTLS for skipping tests if MariaDB Connector/C was build without TLS support.
This commit is contained in:
@@ -36,7 +36,7 @@ static char *mariadb_progname;
|
||||
#define PLUGIN_DIR "%s/@INSTALL_PLUGINDIR@"
|
||||
#define SOCKET "@MARIADB_UNIX_ADDR@"
|
||||
#define PORT "@MARIADB_PORT@"
|
||||
#ifdef HAVE_SSL
|
||||
#ifdef HAVE_TLS
|
||||
#define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@"
|
||||
#else
|
||||
#define TLS_LIBRARY_VERSION ""
|
||||
|
@@ -1401,6 +1401,7 @@ static int test_sslenforce(MYSQL *unused __attribute__((unused)))
|
||||
const char *env= getenv("MYSQL_TMP_DIR");
|
||||
char cnf_file1[FN_REFLEN + 1];
|
||||
|
||||
SKIP_NOTLS;
|
||||
SKIP_SKYSQL;
|
||||
|
||||
if (travis_test)
|
||||
|
@@ -63,6 +63,16 @@ if (IS_SKYSQL(hostname)) \
|
||||
return SKIP; \
|
||||
}
|
||||
|
||||
#ifndef HAVE_SSL
|
||||
#define SKIP_NOTLS \
|
||||
{ \
|
||||
diag("TLS not supported"); \
|
||||
return SKIP;\
|
||||
}
|
||||
#else
|
||||
#define SKIP_NOTLS
|
||||
#endif
|
||||
|
||||
#define MAX_KEY MAX_INDEXES
|
||||
#define MAX_KEY_LENGTH_DECIMAL_WIDTH 4 /* strlen("4096") */
|
||||
|
||||
|
Reference in New Issue
Block a user