mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
7ec6558503
The bitmap implementation defines two template Bitmap classes. One optimized for 64-bit (default) wide bitmaps while the other is used for all other widths. In order to optimize the computations, Bitmap<64> class has defined its own member functions for bitmap operations, the other one, however, relies on mysys' bitmap implementation (mysys/my_bitmap.c). Issue 1: In case of non 64-bit Bitmap class, intersect() wrongly reset the received bitmap while initialising a new local bitmap structure (bitmap_init() clears the bitmap buffer) thus, the received bitmap was getting cleared. Fixed by initializing the local bitmap structure by using a temporary buffer and later copying the received bitmap to the initialised bitmap structure. Issue 2: The non 64-bit Bitmap class had the Iterator missing which caused compilation failure. Also added a cmake variable to hold the MAX_INDEXES value when supplied from the command prompt. (eg. cmake .. -DMAX_INDEXES=128U). Checks have been put in place to trigger build failure if MAX_INDEXES value is greater than 128. Test modifications: * Introduced include/have_max_indexes_[64|128].inc to facilitate skipping of tests for which the output differs with different MAX_INDEXES. * Introduced include/max_indexes.inc which would get modified by cmake to reflect the MAX_INDEXES value used to build the server. This file simply sets an mtr variable '$max_indexes' to show the MAX_INDEXES value, which will then be consumed by the above introduced include file. * Some tests (portions), dependent on MAX_INDEXES value, have been moved to separate test files.
157 lines
5 KiB
CMake
157 lines
5 KiB
CMake
# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; version 2 of the License.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
INSTALL_MYSQL_TEST("." ".")
|
|
|
|
IF(NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
|
# Enable running mtr from build directory
|
|
CONFIGURE_FILE(
|
|
${CMAKE_CURRENT_SOURCE_DIR}/mtr.out-of-source
|
|
${CMAKE_CURRENT_BINARY_DIR}/mysql-test-run.pl
|
|
@ONLY
|
|
)
|
|
ENDIF()
|
|
IF(UNIX)
|
|
EXECUTE_PROCESS(
|
|
COMMAND chmod +x mysql-test-run.pl
|
|
COMMAND ${CMAKE_COMMAND} -E create_symlink
|
|
./mysql-test-run.pl mtr
|
|
COMMAND ${CMAKE_COMMAND} -E create_symlink
|
|
./mysql-test-run.pl mysql-test-run
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
|
)
|
|
IF(INSTALL_MYSQLTESTDIR)
|
|
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mtr
|
|
${CMAKE_CURRENT_BINARY_DIR}/mysql-test-run
|
|
DESTINATION ${INSTALL_MYSQLTESTDIR}
|
|
COMPONENT Test)
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
IF(CMAKE_GENERATOR MATCHES "Visual Studio")
|
|
SET(SETCONFIG_COMMAND set MTR_VS_CONFIG=${CMAKE_CFG_INTDIR})
|
|
ELSEIF(CMAKE_GENERATOR MATCHES "Xcode")
|
|
SET(SETCONFIG_COMMAND export MTR_VS_CONFIG=${CMAKE_CFG_INTDIR})
|
|
ELSE()
|
|
SET(SETCONFIG_COMMAND echo Running tests)
|
|
ENDIF()
|
|
IF(CYGWIN)
|
|
# On cygwin, pretend to be "Unix" system
|
|
SET(SETOS_COMMAND export MTR_CYGWIN_IS_UNIX=1)
|
|
ELSE()
|
|
SET(SETOS_COMMAND echo OS=${CMAKE_SYSTEM_NAME})
|
|
ENDIF()
|
|
|
|
|
|
|
|
SET(EXP --experimental=collections/default.experimental)
|
|
IF(WIN32)
|
|
SET(SET_ENV set)
|
|
ELSE()
|
|
SET(SET_ENV export)
|
|
ENDIF()
|
|
|
|
|
|
SET(MTR_FORCE perl ./mysql-test-run.pl --force)
|
|
IF(EXISTS ${CMAKE_SOURCE_DIR}/mysql-test/suite/nist)
|
|
SET(TEST_NIST ${MTR_FORCE} --comment=nist suite=nist ${EXP} &&
|
|
${MTR_FORCE} --comment=nist --force --suite=nist+ps ${EXP})
|
|
ELSE()
|
|
SET(TEST_NIST echo "NIST tests not found")
|
|
ENDIF()
|
|
|
|
IF(WITH_EMBEDDED_SERVER)
|
|
SET(TEST_EMBEDDED ${MTR_FORCE} --comment=embedded --timer --embedded-server
|
|
--skip-rpl ${EXP})
|
|
ELSE()
|
|
SET(TEST_EMBEDDED echo "Can not test embedded, not compiled in")
|
|
ENDIF()
|
|
|
|
SET(TEST_BT_START
|
|
COMMAND ${SETCONFIG_COMMAND}
|
|
COMMAND ${SETOS_COMMAND}
|
|
COMMAND ${SET_ENV} MTR_BUILD_THREAD=auto
|
|
)
|
|
|
|
ADD_CUSTOM_TARGET(test-force
|
|
${TEST_BT_START}
|
|
COMMAND ${MTR_FORCE}
|
|
)
|
|
|
|
ADD_CUSTOM_TARGET(test-bt
|
|
${TEST_BT_START}
|
|
COMMAND ${MTR_FORCE} --comment=normal --timer --report-features ${EXP}
|
|
COMMAND ${MTR_FORCE} --comment=ps --timer --ps-protocol ${EXP}
|
|
COMMAND ${MTR_FORCE} --comment=funcs1+ps --ps-protocol --reorder --suite=funcs_1 ${EXP}
|
|
COMMAND ${MTR_FORCE} --comment=funcs2 --suite=funcs_2 ${EXP}
|
|
COMMAND ${MTR_FORCE} --comment=partitions --suite=parts ${EXP}
|
|
COMMAND ${MTR_FORCE} --comment=stress --suite=stress ${EXP}
|
|
COMMAND ${MTR_FORCE} --force --comment=jp --suite=jp ${EXP}
|
|
COMMAND ${TEST_NIST}
|
|
COMMAND ${TEST_EMBEDDED}
|
|
)
|
|
|
|
ADD_CUSTOM_TARGET(test-bt-fast
|
|
${TEST_BT_START}
|
|
COMMAND ${MTR_FORCE} --comment=ps --timer --ps-protocol --report-features ${EXP}
|
|
COMMAND ${MTR_FORCE} --comment=stress --suite=stress ${EXP}
|
|
)
|
|
|
|
ADD_CUSTOM_TARGET(test-bt-debug
|
|
${TEST_BT_START}
|
|
COMMAND ${MTR_FORCE} --comment=debug --timer --skip-rpl --report-features ${EXP}
|
|
)
|
|
|
|
# Process .in files with includes in collections/
|
|
|
|
MACRO(PROCESS_COLLECTION_INCLUDE collin collection)
|
|
FILE(STRINGS ${collin} inlines)
|
|
FOREACH(line ${inlines})
|
|
IF(${line} MATCHES "#include .*")
|
|
STRING(REPLACE "#include " "collections/" incfile ${line})
|
|
FILE(READ ${incfile} contents)
|
|
FILE(APPEND ${collection} "${contents}")
|
|
ELSE()
|
|
FILE(APPEND ${collection} "${line}\n")
|
|
ENDIF()
|
|
ENDFOREACH()
|
|
ENDMACRO()
|
|
|
|
#FILE(GLOB infiles "collections/*.in")
|
|
#FOREACH(collin ${infiles})
|
|
# STRING(REPLACE ".in" "" collection ${collin})
|
|
# STRING(REPLACE ".in" ".done" colldone ${collin})
|
|
# # Only generate file once
|
|
# IF(NOT EXISTS ${colldone})
|
|
# PROCESS_COLLECTION_INCLUDE(${collin} ${collection})
|
|
# FILE(APPEND ${colldone} "${collin}\n")
|
|
# ENDIF()
|
|
#ENDFOREACH()
|
|
|
|
# With different MAX_INDEXES values, server might behave differently in
|
|
# certain cases. 'max_indexes.inc' file should be updated accordingly to
|
|
# reflect the current MAX_INDEXES value. This file helps MTR to decide on
|
|
# which tests should be skipped.
|
|
# NOTE: While committing a patch please make sure that the file is unmodified
|
|
# and should show the default MAX_INDEXES (i.e. 64U).
|
|
IF (MAX_INDEXES)
|
|
IF(NOT (${MAX_INDEXES} EQUAL 64U))
|
|
FILE(WRITE include/max_indexes.inc
|
|
"# Warning: This is an auto-generated file. Please do not modify it.
|
|
--let $max_indexes = ${MAX_INDEXES}\n")
|
|
MESSAGE(STATUS "mysql-test/include/max_indexes.inc adjusted")
|
|
ENDIF()
|
|
ENDIF()
|
|
|