From 6fff06a2ee081d18f88d65f0270e40ef4e4131ed Mon Sep 17 00:00:00 2001 From: Snaipe Date: Thu, 14 Jan 2016 12:25:46 +0100 Subject: [PATCH] Made cram tests run on travis --- .travis.yml | 1 + test/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57fa759..fa50962 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,6 +90,7 @@ before_install: brew unlink cmake brew install llvm cmake fi + - pip install cram - export CXX=${CC/gcc/g++}; export CXX=${CXX/clang/clang++} - $CC --version - $CXX --version diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e702d8d..b6862a4 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -43,9 +43,9 @@ add_custom_target(cram_tests ${CMAKE_COMMAND} -E env "CRITERION_NO_EARLY_EXIT=1" # for coverage "CRITERION_JOBS=1" # for output ordering "CRITERION_DISABLE_TIME_MEASUREMENTS=1" # do not compare timings - cram -i ${CMAKE_CURRENT_SOURCE_DIR}) + cram -v ${CMAKE_CURRENT_SOURCE_DIR}) add_dependencies(cram_tests criterion_samples) -add_test(cram_tests cram_tests) +add_test(cram_tests make cram_tests) endif ()