diff options
| author | Robin Newhouse <robinnew@amazon.com> | 2023-01-05 00:20:44 +0000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2023-01-05 13:37:24 +1100 |
| commit | f8f747547a64ca82a5784fa394d99d38827c67ae (patch) | |
| tree | 5413c535e225665b64cf2eb700458bb0c11c1e83 | |
| parent | d0603fc5ba4dc17a155a575edd79ae0fb9de3679 (diff) | |
| download | mariadb-git-f8f747547a64ca82a5784fa394d99d38827c67ae.tar.gz | |
MDEV-30344 MTR tests fail when built without WSREP
When building with -DWITH_WSREP=OFF, files required for MTR tests are
excluded and several tests fail. This is cause by a recent commit
7b44d0ba which attempted to resolve MDEV-23230.
Even when building without WSREP/Galera support some of the MTR include
files named *wsrep* are required by other tests.
Removing the following from the CMake install macros will avoid
excluding the MTR test .inc files:
`|include/((w.*)?wsrep.*|.*galera.*)\\.inc`
All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer
Amazon Web Services, Inc.
| -rw-r--r-- | cmake/install_macros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index 7814f1dbeac..fba0bd03dac 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -266,7 +266,7 @@ SET(DEBUGBUILDDIR "${BINARY_PARENTDIR}/debug" CACHE INTERNAL "Directory of debug FUNCTION(INSTALL_MYSQL_TEST from to) IF(INSTALL_MYSQLTESTDIR) IF(NOT WITH_WSREP) - SET(EXCL_GALERA "(suite/(galera|wsrep|sys_vars/[rt]/(sysvars_)?wsrep).*|include/((w.*)?wsrep.*|.*galera.*)\\.inc|std_data/(galera|wsrep).*)") + SET(EXCL_GALERA "(suite/(galera|wsrep|sys_vars/[rt]/(sysvars_)?wsrep).*|std_data/(galera|wsrep).*)") ELSE() SET(EXCL_GALERA "^DOES_NOT_EXIST$") ENDIF() |