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

Travis fixes:

Browse Source 
- Build x64 (for some unknown reason default windows build
  on travis is x86)
- Disable conc336
This commit is contained in:
Georg Richter
2024-10-02 10:23:40 +02:00
parent 997f0dee0e
commit d00de5f997
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
travis.sh
View File

@@ -64,7 +64,7 @@ else
cd bld cd bld
if [ "$TRAVIS_OS_NAME" = "windows" ] ; then if [ "$TRAVIS_OS_NAME" = "windows" ] ; then
export WIX="c:/Program Files (x86)/WiX Toolset v3.14" export WIX="c:/Program Files (x86)/WiX Toolset v3.14"
cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCERT_PATH=${SSLCERT} -DWITH_MSI=ON -DWITH_CURL=ON -DPython_ROOT_DIR=c:\python312 cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_GENERATOR_PLATFORM=x64 -DCERT_PATH=${SSLCERT} -DWITH_MSI=ON -DWITH_CURL=ON -DPython_ROOT_DIR=c:\python312
echo "build from windows" echo "build from windows"
export MARIADB_CC_TEST=1 export MARIADB_CC_TEST=1

2
unittest/libmariadb/conc336.c
View File

@@ -19,6 +19,8 @@ int main(int argc, char *argv[]) {
if (IS_SKYSQL(hostname)) if (IS_SKYSQL(hostname))
return 0; return 0;
SKIP_TRAVIS(();
if (IS_XPAND()) if (IS_XPAND())
SKIP_XPAND; SKIP_XPAND;