Fixed Matthias suggestions.

diff --git a/.travis.yml b/.travis.yml
index b689f117d2d4f2fa13e05f5d9fb962aea0d4c2c2..f77c9360794d6aa2705a982f40d97c5d67e81930 100644 (file)
--- 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 63ac0eecaa7b4d2648ab94a97f6a87de1e864356..651dc1b1d7936c9e3079bf159eddfe83c360872c 100755 (executable)
--- 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