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

[travis] Fixed cram tests not running

Browse source
This commit is contained in:
Snaipe 2016-01-20 12:57:19 +01:00
parent 033bcacf7f
commit 79648c7136
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.cmake/Modules/Cram.cmake
View file

@ -46,13 +46,17 @@ if (WIN32)
endif ()
endif ()
if (NOT ENV{PYTHON_BIN})
set (PYTHON "python")
if ("$ENV{TRAVIS}" STREQUAL "true")
execute_process (COMMAND cram -v ${CRAM_OPTS} "${CRAM_PATH}" TIMEOUT 60 RESULT_VARIABLE RES)
else ()
set (PYTHON "$ENV{PYTHON_BIN}")
endif ()
if (NOT ENV{PYTHON_BIN})
set (PYTHON "python")
else ()
set (PYTHON "$ENV{PYTHON_BIN}")
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)
endif ()
if (NOT RES STREQUAL "0")
message (FATAL_ERROR "Cram tests failed")