RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 18:02:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23382 from tchaikov/wip-gtest-parallel-py3

Browse Source 
cmake,run-make-check: always enable WITH_GTEST_PARALLEL

Reviewed-by: Nathan Cutler <ncutler@suse.com>
This commit is contained in:
Nathan Cutler 2018-08-02 18:11:30 +02:00 committed by GitHub
commit 13d3d7c862
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/AddCephTest.cmake
View File

@ -35,7 +35,7 @@ if(WITH_GTEST_PARALLEL)
BUILD_COMMAND ""
INSTALL_COMMAND "")
add_dependencies(tests gtest-parallel_ext)
find_package(PythonInterp 2.7 REQUIRED)
find_package(PythonInterp REQUIRED)
set(GTEST_PARALLEL_COMMAND
${PYTHON_EXECUTABLE} ${gtest_parallel_source_dir}/gtest-parallel)
endif()

16
run-make-check.sh
View File

@ -99,16 +99,10 @@ function run() {
BUILD_MAKEOPTS=${BUILD_MAKEOPTS:-$DEFAULT_MAKEOPTS}
test "$BUILD_MAKEOPTS" && echo "make will run with option(s) $BUILD_MAKEOPTS"
CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS}
if type python2 > /dev/null 2>&1 ; then
# gtest-parallel requires Python 2
CMAKE_PYTHON_OPTS="-DWITH_GTEST_PARALLEL=ON"
else
CMAKE_PYTHON_OPTS="-DWITH_PYTHON2=OFF -DWITH_PYTHON3=ON -DMGR_PYTHON_VERSION=3 -DWITH_GTEST_PARALLEL=OFF"
CMAKE_BUILD_OPTS="-DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON"
if ! type python2 > /dev/null 2>&1 ; then
CMAKE_BUILD_OPTS+=" -DWITH_PYTHON2=OFF -DWITH_PYTHON3=ON -DMGR_PYTHON_VERSION=3"
fi
CMAKE_BUILD_OPTS="-DWITH_FIO=ON -DWITH_SEASTAR=ON"
cat <<EOM
Note that the binaries produced by this script do not contain correct time
and git version information, which may make them unsuitable for debugging
@ -116,7 +110,7 @@ and production use.
EOM
save_ccache_conf
# remove the entropy generated by the date/time embedded in the build
CMAKE_BUILD_OPTS="$CMAKE_BUILD_OPTS -DENABLE_GIT_VERSION=OFF"
CMAKE_BUILD_OPTS+=" -DENABLE_GIT_VERSION=OFF"
$DRY_RUN export SOURCE_DATE_EPOCH="946684800"
$DRY_RUN ccache -o sloppiness=time_macros
$DRY_RUN ccache -o run_second_cpp=true
@ -131,7 +125,7 @@ EOM
fi
$DRY_RUN ccache -z # Reset the ccache statistics
$DRY_RUN ./do_cmake.sh $CMAKE_BUILD_OPTS $CMAKE_PYTHON_OPTS $@ || return 1
$DRY_RUN ./do_cmake.sh $CMAKE_BUILD_OPTS $@ || return 1
$DRY_RUN cd build
$DRY_RUN make $BUILD_MAKEOPTS tests || return 1