diff --git a/travis.sh b/travis.sh index 2be80615..cb87ef63 100755 --- a/travis.sh +++ b/travis.sh @@ -64,7 +64,7 @@ else cd bld if [ "$TRAVIS_OS_NAME" = "windows" ] ; then 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" export MARIADB_CC_TEST=1 diff --git a/unittest/libmariadb/conc336.c b/unittest/libmariadb/conc336.c index 746d574c..dd52d52d 100644 --- a/unittest/libmariadb/conc336.c +++ b/unittest/libmariadb/conc336.c @@ -19,6 +19,8 @@ int main(int argc, char *argv[]) { if (IS_SKYSQL(hostname)) return 0; + SKIP_TRAVIS((); + if (IS_XPAND()) SKIP_XPAND;