stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[cmake] Read python name from PYTHON_BIN in cram module

Browse source
This commit is contained in:
Snaipe 2016-01-20 12:25:34 +01:00
parent cf63230bf6
commit 7f7029cb03
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.cmake/Modules/Cram.cmake
View file

@ -46,12 +46,10 @@ if (WIN32)
endif () endif ()
endif () endif ()
execute_process (COMMAND python3 --version TIMEOUT 1 RESULT_VARIABLE PYTHON3_RES) if (NOT ENV{PYTHON_BIN})
if (NOT PYTHON3_RES STREQUAL "0")
set (PYTHON "python") set (PYTHON "python")
else () else ()
set (PYTHON "python3") set (PYTHON "$ENV{PYTHON_BIN}")
endif () endif ()
execute_process (COMMAND ${PYTHON} -m cram -v ${CRAM_OPTS} "${CRAM_PATH}" TIMEOUT 60 RESULT_VARIABLE RES) execute_process (COMMAND ${PYTHON} -m cram -v ${CRAM_OPTS} "${CRAM_PATH}" TIMEOUT 60 RESULT_VARIABLE RES)

2
.travis.yml
View file

@ -103,8 +103,10 @@ before_install:
if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew install python3 brew install python3
export PATH="$(python3 -m site --user-base)/bin:$PATH" export PATH="$(python3 -m site --user-base)/bin:$PATH"
export PYTHON_BIN="python3"
else else
curl -L https://bootstrap.pypa.io/get-pip.py | python3.5 - --user curl -L https://bootstrap.pypa.io/get-pip.py | python3.5 - --user
export PYTHON_BIN="python3.5"
fi fi
pip3 install --user cram==0.6 pip3 install --user cram==0.6