From 0cdd1d7744b7faae797d16bc5c58ff2066bc673b Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Thu, 7 Aug 2014 11:52:16 +0200 Subject: [PATCH] Fixed Matthias suggestions. --- .travis.yml | 10 ++++++---- contrib/utilities/run_travis.sh | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index b689f117d2..f77c936079 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,11 +17,13 @@ branches: - master env: - - CI_TEST_SUITE=mini CI_BUILD_TYPE=Debug - - CI_TEST_SUITE=mini CI_BUILD_TYPE=Release # This is way too long. We should find a way to do this in little pieces... # - CI_TEST_SUITE=tests # These tests run ok, but they might be out of policy... -# - CI_TEST_SUITE=build CI_BUILD_TYPE=Debug -# - CI_TEST_SUITE=build CI_BUILD_TYPE=Release + - CI_TEST_SUITE=build CI_BUILD_TYPE=Debug + - CI_TEST_SUITE=build CI_BUILD_TYPE=Release + +# These tests only compile and run "make tests" +# - CI_TEST_SUITE=mini CI_BUILD_TYPE=Debug +# - CI_TEST_SUITE=mini CI_BUILD_TYPE=Release diff --git a/contrib/utilities/run_travis.sh b/contrib/utilities/run_travis.sh index 63ac0eecaa..651dc1b1d7 100755 --- a/contrib/utilities/run_travis.sh +++ b/contrib/utilities/run_travis.sh @@ -1,21 +1,21 @@ #!/bin/sh case $1 in -mini) - echo "Building and running mini tests in $2 mode." - mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=$2 ../ && make -j4 && make tests - ;; +#mini) +# echo "Building and running mini tests in $2 mode." +# mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=$2 ../ && make -j4 && make tests +# ;; build) echo "Running build tests." mkdir build_test cd build_test ctest -DCMAKE_BUILD_TYPE=$2 -V -j4 -S ../tests/run_buildtest.cmake ;; -tests) - echo "Running full testsuite." - mkdir full_tests - cd full_tests - ctest -DCMAKE_BUILD_TYPE=$2 -V -j4 -S ../tests/run_testsuite.cmake - ;; +#tests) +# echo "Running full testsuite." +# mkdir full_tests +# cd full_tests +# ctest -DCMAKE_BUILD_TYPE=$2 -V -j4 -S ../tests/run_testsuite.cmake +# ;; *) echo "Unrecognized test type! [$1]" exit 1 -- 2.39.5