RepoMirrors
/
ceph
mirror of https://github.com/ceph/ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
ceph/cmake/modules/AddCephTest.cmake

51 lines
2.1 KiB
CMake
Raw Normal View History

cmake: Reorganized test dir, added cmake functions make check targets now use add_ceph_test, or add_ceph_unittest to be added to CTest. Renamed and reordered targets in tests/CMakeLists.txt Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-26 20:45:15 +00:00
#AddCephTest is a module for adding tests to the "make check" target which runs CTest
#adds makes target/script into a test, test to check target, sets necessary environment variables
function(add_ceph_test test_name test_path)
cmake: Support extra arguments to tests using add_ceph_test Signed-off-by: David Zafman <dzafman@redhat.com>
2016-07-26 20:23:52 +00:00
add_test(NAME ${test_name} COMMAND ${test_path} ${ARGN})
cmake: enable CMP0046 so cmake will error on "non-existent dependency in add_dependencies", we add dependency on CONFIGURE_FILE() output, which is wrong, as its output is not a target, and is generated when cmake runs. so remove them from dependencies. regarding to ceph_ver.h, its path is also wrong. it is created under ${CMAKE_BINARY_DIR}/src/include. so this is another reason to remove it. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-04-26 08:44:07 +00:00
if(TARGET ${test_name})
add_dependencies(tests ${test_name})
endif()
cmake: add a "tests" target to build tests please note "make test" is used by cmake to run tests, so we cannot just repurpose it to *build* them. * AddCephTest.cmake: depends on "tests" * CMakeLists.txt: let "check" depend on "tests" * src/CMakeLists.txt: update the run-tox tests * run-make-check.sh: use "make tests" and "ctest" instead of "make check" * ceph-detect-init/CMakeLists.txt: let "tests" depend on "ceph-detect-init" * ceph-disk/CMakeLists.txt: let "tests" depend on "ceph-disk" Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-13 13:14:30 +00:00
set_property(TEST
cmake: Reorganized test dir, added cmake functions make check targets now use add_ceph_test, or add_ceph_unittest to be added to CTest. Renamed and reordered targets in tests/CMakeLists.txt Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-26 20:45:15 +00:00
${test_name}
PROPERTY ENVIRONMENT
CEPH_ROOT=${CMAKE_SOURCE_DIR}
CEPH_BIN=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
CEPH_LIB=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
cmake: ceph_objectstore_tool.py test passing Replaced relative paths in shell scripts in test/ceph_objectstore_tool.py and init-ceph.in to work with CEPH_FOO environment variables set in cmake. Also added CEPH_BUILD_DIR environment variable set to CMAKE_BINARY_DIR. It is used in init-ceph and ceph_objectstore_tool.py. Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-26 20:32:05 +00:00
CEPH_BUILD_DIR=${CMAKE_BINARY_DIR}
cmake: Reorganized test dir, added cmake functions make check targets now use add_ceph_test, or add_ceph_unittest to be added to CTest. Renamed and reordered targets in tests/CMakeLists.txt Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-26 20:45:15 +00:00
LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib
PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src:$ENV{PATH}
cmake: Also build Python bindings for Python 3 Signed-off-by: Oleh Prypin <oleh@pryp.in>
2016-07-13 12:57:30 +00:00
PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules/lib.${PYTHON${PYTHON_VERSION}_VERSION_MAJOR}:${CMAKE_SOURCE_DIR}/src/pybind
cmake: pass CEPH_BUILD_VIRTUALENV to test as an env variable Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-10 13:50:17 +00:00
CEPH_BUILD_VIRTUALENV=${CEPH_BUILD_VIRTUALENV})
cmake: only allow up to 1 hour for a ceph test quote from https://cmake.org/cmake/help/v3.0/prop_test/TIMEOUT.html?highlight=timeout > If it exceeds that the test process will be killed and ctest will move > to the next test. this helps us to identify test hang. Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-14 07:59:14 +00:00
# none of the tests should take more than 1 hour to complete
set_property(TEST
${test_name}
PROPERTY TIMEOUT 3600)
cmake: Reorganized test dir, added cmake functions make check targets now use add_ceph_test, or add_ceph_unittest to be added to CTest. Renamed and reordered targets in tests/CMakeLists.txt Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-26 20:45:15 +00:00
endfunction()
cmake: add WITH_GTEST_PARALLEL option and remove src/test/gtest-parallel submodule, because gtest-parallel is only useful for running tests. and not all end-users are interested in running test not to mention running them in parallel. so, to avoid including gtest-parallel scripts in the dist tarball. it'd be better to make it optional, and an external project. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-06-15 05:54:31 +00:00
option(WITH_GTEST_PARALLEL "Enable running gtest based tests in parallel" OFF)
if(WITH_GTEST_PARALLEL)
include(ExternalProject)
ExternalProject_Add(gtest-parallel_ext
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/gtest-parallel
GIT_REPOSITORY "https://github.com/google/gtest-parallel.git"
GIT_TAG "master"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND "")
add_dependencies(tests gtest-parallel_ext)
endif()
cmake: Reorganized test dir, added cmake functions make check targets now use add_ceph_test, or add_ceph_unittest to be added to CTest. Renamed and reordered targets in tests/CMakeLists.txt Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-26 20:45:15 +00:00
#sets uniform compiler flags and link libraries
cmake: always use CMAKE_RUNTIME_OUTPUT_DIRECTORY as the unittests' path Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-03 13:15:50 +00:00
function(add_ceph_unittest unittest_name)
src/test: Using gtest-parallel to speedup unittests Unittests are run sequentially and could take a long while to run. This commit is about using gtest-parallel on some of them which are known to be very slow due to this sequentiality. To enable the parallel features, the 'parallel' argument just have to be added to the add_ceph_unittest() call like in : -add_ceph_unittest(unittest_throttle) +add_ceph_unittest(unittest_throttle parallel) This commit impact the following tests : Test name Before After (in seconds) unittest_erasure_code_shec_all: 212 43 unittest_throttle 15 5 unittest_crush 9 6 unittest_rbd_mirror 79 21 Total 315 75 This commit saves 240 seconds (4 minutes) per build. Note it exist several other long tests but can't be parallelized since there is explicit dependencies in the order to run the subtests. Those stay sequential. Signed-off-by: Erwan Velu <erwan@redhat.com>
2018-06-14 13:24:07 +00:00
set(UNITTEST "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${unittest_name}")
# If the second argument is "parallel", it means we want a parallel run
cmake: add WITH_GTEST_PARALLEL option and remove src/test/gtest-parallel submodule, because gtest-parallel is only useful for running tests. and not all end-users are interested in running test not to mention running them in parallel. so, to avoid including gtest-parallel scripts in the dist tarball. it'd be better to make it optional, and an external project. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-06-15 05:54:31 +00:00
if(WITH_GTEST_PARALLEL AND "${ARGV1}" STREQUAL "parallel")
ExternalProject_Get_Property(gtest-parallel_ext source_dir)
set(UNITTEST ${source_dir}/gtest-parallel ${UNITTEST})
src/test: Using gtest-parallel to speedup unittests Unittests are run sequentially and could take a long while to run. This commit is about using gtest-parallel on some of them which are known to be very slow due to this sequentiality. To enable the parallel features, the 'parallel' argument just have to be added to the add_ceph_unittest() call like in : -add_ceph_unittest(unittest_throttle) +add_ceph_unittest(unittest_throttle parallel) This commit impact the following tests : Test name Before After (in seconds) unittest_erasure_code_shec_all: 212 43 unittest_throttle 15 5 unittest_crush 9 6 unittest_rbd_mirror 79 21 Total 315 75 This commit saves 240 seconds (4 minutes) per build. Note it exist several other long tests but can't be parallelized since there is explicit dependencies in the order to run the subtests. Those stay sequential. Signed-off-by: Erwan Velu <erwan@redhat.com>
2018-06-14 13:24:07 +00:00
endif()
add_ceph_test(${unittest_name} "${UNITTEST}")
cmake: Reorganized test dir, added cmake functions make check targets now use add_ceph_test, or add_ceph_unittest to be added to CTest. Renamed and reordered targets in tests/CMakeLists.txt Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-26 20:45:15 +00:00
target_link_libraries(${unittest_name} ${UNITTEST_LIBS})
set_target_properties(${unittest_name} PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
endfunction()