database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Merge branch '3.1' into 3.2

Browse Source
This commit is contained in:
Georg Richter
2021-06-24 16:49:15 +02:00
parent 353e99fba1 d111980380
commit 16a031945a
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
appveyor.yml
View File

@@ -24,6 +24,7 @@ before_build:
- cmd: appveyor-download.bat - cmd: appveyor-download.bat
- cmd: msiexec /i server.msi INSTALLDIR=c:\projects\server SERVICENAME=mariadb ALLOWREMOTEROOTACCESS=true /qn - cmd: msiexec /i server.msi INSTALLDIR=c:\projects\server SERVICENAME=mariadb ALLOWREMOTEROOTACCESS=true /qn
- cmd: "\"c:\\projects\\server\\bin\\mysql.exe\" -e \"create database testc\" --user=root" - cmd: "\"c:\\projects\\server\\bin\\mysql.exe\" -e \"create database testc\" --user=root"
- cmd: set MARIADB_CC_TEST=1
- cmd: set MYSQL_TEST_USER=root - cmd: set MYSQL_TEST_USER=root
- cmd: set MYSQL_TEST_HOST=127.0.0.1 - cmd: set MYSQL_TEST_HOST=127.0.0.1
- cmd: set MYSQL_TEST_PASSWD= - cmd: set MYSQL_TEST_PASSWD=

2
travis.sh
View File

@@ -52,6 +52,7 @@ else
if [ "$TRAVIS_OS_NAME" = "windows" ] ; then if [ "$TRAVIS_OS_NAME" = "windows" ] ; then
echo "build from windows" echo "build from windows"
set MARIADB_CC_TEST=1
set MYSQL_TEST_DB=testc set MYSQL_TEST_DB=testc
set MYSQL_TEST_TLS=%TEST_REQUIRE_TLS% set MYSQL_TEST_TLS=%TEST_REQUIRE_TLS%
set MYSQL_TEST_USER=%TEST_DB_USER% set MYSQL_TEST_USER=%TEST_DB_USER%
@@ -62,6 +63,7 @@ else
cmake --build . --config RelWithDebInfo cmake --build . --config RelWithDebInfo
else else
echo "build from linux" echo "build from linux"
export MARIADB_CC_TEST=1
export MYSQL_TEST_USER=$TEST_DB_USER export MYSQL_TEST_USER=$TEST_DB_USER
export MYSQL_TEST_HOST=$TEST_DB_HOST export MYSQL_TEST_HOST=$TEST_DB_HOST
export MYSQL_TEST_PASSWD=$TEST_DB_PASSWORD export MYSQL_TEST_PASSWD=$TEST_DB_PASSWORD

7
unittest/libmariadb/my_test.h
View File

@@ -556,6 +556,13 @@ static int reset_connection(MYSQL *mysql) {
void get_envvars() { void get_envvars() {
char *envvar; char *envvar;
if (!getenv("MYSQLTEST_VARDIR") &&
!getenv("MARIADB_CC_TEST"))
{
skip_all("Tests skipped.\nFor running unittest suite outside of MariaDB server tests,\nplease specify MARIADB_CC_TEST environment variable.");
exit(0);
}
if (getenv("TRAVIS_JOB_ID")) if (getenv("TRAVIS_JOB_ID"))
travis_test= 1; travis_test= 1;