Skip to content

Commit

Permalink
run-make-check.sh: gtest-parallel only with Python 2
Browse files Browse the repository at this point in the history
Fixes: http://tracker.ceph.com/issues/24817
Signed-off-by: Nathan Cutler <[email protected]>
  • Loading branch information
smithfarm committed Jul 9, 2018
1 parent f9c0691 commit 3d6909b
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions run-make-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,14 @@ function run() {
test "$BUILD_MAKEOPTS" && echo "make will run with option(s) $BUILD_MAKEOPTS"
CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS}

CMAKE_PYTHON_OPTS=
if ! type python2 > /dev/null 2>&1 ; then
CMAKE_PYTHON_OPTS="-DWITH_PYTHON2=OFF -DWITH_PYTHON3=ON -DMGR_PYTHON_VERSION=3"
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"
fi

CMAKE_BUILD_OPTS="-DWITH_FIO=ON -DWITH_GTEST_PARALLEL=ON"
CMAKE_BUILD_OPTS="-DWITH_FIO=ON"

cat <<EOM
Note that the binaries produced by this script do not contain correct time
Expand Down

0 comments on commit 3d6909b

Please sign in to comment.