test

vaintroub · Feb 18, 2024 · 948dcac · 948dcac
1 parent 313657e
commit 948dcac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/cmake-single-os.yml b/.github/workflows/cmake-single-os.yml
@@ -167,13 +167,13 @@ jobs:
              echo "LUA_PATH=$PWD/install_dir/share/sysbench/?.lua" >> $GITHUB_ENV
       - name: smoke test
         run: |
-          mysql --version
-          mysql -uroot --host=127.0.0.1 -e "create database sbtest"
+          #mysql --version
+          #mysql -uroot --host=127.0.0.1 -e "create database sbtest"
           sysbench --version
           sysbench --help
-          sysbench oltp_read_write --mysql-user=root --mysql-host=127.0.0.1 prepare
-          sysbench oltp_read_write --mysql-user=root --mysql-host=127.0.0.1 run --threads=2 --histogram
-          sysbench oltp_read_write --mysql-user=root --mysql-host=127.0.0.1 cleanup
+          sysbench oltp_read_write --mysql-user=root --mysql-db=mysql --mysql-host=127.0.0.1 prepare
+          sysbench oltp_read_write --mysql-user=root --mysql-db=mysql --mysql-host=127.0.0.1 run --threads=2 --histogram
+          sysbench oltp_read_write --mysql-user=root --mysql-db=mysql --mysql-host=127.0.0.1 cleanup
           sysbench cpu run --threads=2
           sysbench fileio --file-test-mode=seqrewr prepare
           sysbench fileio --file-test-mode=seqrewr run
@@ -184,7 +184,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        db: [mariadb, mysql-8.0, postgres]
+        db: [mariadb, mysql, postgres]
     needs: build
     runs-on: ${{ inputs.os }}
     #if: contains(inputs.os,'windows')

diff --git a/cmake/BuildLibmariadb.cmake b/cmake/BuildLibmariadb.cmake
@@ -33,7 +33,8 @@ if(WIN32)
 endif()
 
 if(MSVC)
-list(APPEND  _EXTRA_CMAKE_ARGS -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON
+list(APPEND  _EXTRA_CMAKE_ARGS
+    -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=ON
     -DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO=ON
     -DCMAKE_POLICY_DEFAULT_CMP0069=NEW
 )
@@ -86,7 +87,7 @@ ExternalProject_Add(
              -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=STATIC
              -DCLIENT_PLUGIN_DIALOG=OFF
              -DCLIENT_PLUGIN_CLIENT_ED25519=OFF
-             -DCLIENT_PLUGIN_SHA256_PASSWORD=OFF
+             -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC
              -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=OFF
              -DCLIENT_PLUGIN_ZSTD=OFF
              -DSKIP_TESTS=1