From 960dca55ae590aa22d491b691b7c62740aca60d0 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@mariadb.com>
Date: Mon, 16 Mar 2020 14:02:12 +0100
Subject: [PATCH] Travis fixes:

server verification still fails due to wrong hostname - these tests are now disabled for Travis only
Disable test when testing against a MySQL server.
---
 unittest/libmariadb/misc.c    |  6 +++++-
 unittest/libmariadb/my_test.h | 14 ++++++++++++++
 unittest/libmariadb/ssl.c     |  2 ++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/unittest/libmariadb/misc.c b/unittest/libmariadb/misc.c
index dd3e451e..09dd5ab0 100644
--- a/unittest/libmariadb/misc.c
+++ b/unittest/libmariadb/misc.c
@@ -1428,7 +1428,11 @@ static int test_sslenforce(MYSQL *unused __attribute__((unused)))
 
 static int test_conc457(MYSQL *mysql)
 {
-  MYSQL_RES *result= mysql_list_processes(mysql);
+  MYSQL_RES *result;
+
+  SKIP_MYSQL(mysql);
+
+  result= mysql_list_processes(mysql);
 
   FAIL_IF(mysql_field_count(mysql) != 9, "expected 9 columns");
   mysql_free_result(result);
diff --git a/unittest/libmariadb/my_test.h b/unittest/libmariadb/my_test.h
index 6aea37b2..e388ba83 100644
--- a/unittest/libmariadb/my_test.h
+++ b/unittest/libmariadb/my_test.h
@@ -66,6 +66,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 /* prevent warnings on Win64 by using STMT_LEN instead of strlen */
 #define STMT_LEN(A) (unsigned long)strlen((A))
 
+#define SKIP_TRAVIS()\
+if (getenv("TRAVIS"))\
+{\
+  diag("Skip test on Travis CI");\
+  return SKIP;\
+}
+
+#define SKIP_MYSQL(mysql)\
+if (!mariadb_connection(mysql))
+{
+  diag("Skip test for non MariaDB server");
+  return OK;
+}
+
 #define check_mysql_rc(rc, mysql) \
 if (rc)\
 {\
diff --git a/unittest/libmariadb/ssl.c b/unittest/libmariadb/ssl.c
index 95c9223b..d4b91fc7 100644
--- a/unittest/libmariadb/ssl.c
+++ b/unittest/libmariadb/ssl.c
@@ -625,6 +625,8 @@ static int verify_ssl_server_cert(MYSQL *unused __attribute__((unused)))
   if (!hostname || !strcmp(hostname, "localhost"))
     return SKIP;
 
+  SKIP_TRAVIS();
+
   mysql= mysql_init(NULL);
   FAIL_IF(!mysql, "Can't allocate memory");