From 79648c71367e216c45a7043894056530d1a18b71 Mon Sep 17 00:00:00 2001 From: Snaipe Date: Wed, 20 Jan 2016 12:57:19 +0100 Subject: [PATCH] [travis] Fixed cram tests not running --- .cmake/Modules/Cram.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.cmake/Modules/Cram.cmake b/.cmake/Modules/Cram.cmake index 5361cbb..73697a4 100644 --- a/.cmake/Modules/Cram.cmake +++ b/.cmake/Modules/Cram.cmake @@ -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")