Added tests in Release mode

8 years ago · c4d6c1b787
2 changed files with 48 additions and 49 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -11,80 +11,79 @@ matrix:
  fast_finish: true

  include:
+
+  ###
+  # Ubuntu 16.10
+  ###
+  - compiler: gcc
+    env: TEST=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
+    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+      travis/install_linux.sh
+    os: linux
+    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
+      travis/postsubmit.sh DefaultDebug
+    before_cache:
+      docker cp storm:/storm/. .
  - compiler: gcc
-    env: COMPILER=gcc-6 LINUX=ubuntu-16.10 TEST=DebugPlain
+    env: TEST=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
      travis/install_linux.sh
    os: linux
    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
-      travis/postsubmit.sh DebugPlain
+      travis/postsubmit.sh DefaultRelease
    before_cache:
      docker cp storm:/storm/. .
+
+  ###
+  # Debian 9
+  ###
  - compiler: gcc
-    env: COMPILER=gcc-6 LINUX=debian-9 TEST=DebugPlain
+    env: TEST=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
      travis/install_linux.sh
    os: linux
    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
-      travis/postsubmit.sh DebugPlain
+      travis/postsubmit.sh DefaultDebug
    before_cache:
      docker cp storm:/storm/. .
-#  - compiler: gcc
-#    env: COMPILER=gcc-6 UBUNTU=17.04 TEST=DebugPlain
-#    install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/travis_ci_install_linux.sh
-#    os: linux
-#    script: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/postsubmit.sh
-#      DebugPlain
-#  - compiler: gcc
-#    env: COMPILER=gcc-6 UBUNTU=17.04 TEST=ReleasePlain
-#    install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/travis_ci_install_linux.sh
-#    os: linux
-#    script: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/postsubmit.sh
-#      ReleasePlain
-#  - compiler: clang
-#    env: COMPILER=clang-4.0 STL=libstdc++ UBUNTU=17.04 TEST=DebugPlain
-#    install: export OS=linux; export COMPILER='clang-4.0'; export STL='libstdc++';
-#      export UBUNTU='17.04'; extras/scripts/travis_ci_install_linux.sh
-#    os: linux
-#    script: export OS=linux; export COMPILER='clang-4.0'; export STL='libstdc++';
-#      export UBUNTU='17.04'; extras/scripts/postsubmit.sh DebugPlain
-#  - compiler: clang
-#    env: COMPILER=clang-4.0 STL=libstdc++ UBUNTU=17.04 TEST=ReleasePlain
-#    install: export OS=linux; export COMPILER='clang-4.0'; export STL='libstdc++';
-#      export UBUNTU='17.04'; extras/scripts/travis_ci_install_linux.sh
-#    os: linux
-#    script: export OS=linux; export COMPILER='clang-4.0'; export STL='libstdc++';
-#      export UBUNTU='17.04'; extras/scripts/postsubmit.sh ReleasePlain
-#  - compiler: gcc
-#    env: COMPILER=gcc-6 TEST=DebugPlain
-#    install: export OS=osx; export COMPILER='gcc-6'; export INSTALL_VALGRIND=1; extras/scripts/travis_ci_install_osx.sh
-#    os: osx
-#    osx_image: xcode8
-#    script: export OS=osx; export COMPILER='gcc-6'; export INSTALL_VALGRIND=1; extras/scripts/postsubmit.sh
-#      DebugPlain
+  - compiler: gcc
+    env: TEST=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
+    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+      travis/install_linux.sh
+    os: linux
+    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+      travis/postsubmit.sh DefaultRelease
+    before_cache:
+      docker cp storm:/storm/. .
+
+  ###
+  # Mac OS X
+  ###
+  - compiler: clang
+    env: TEST=DefaultDebug COMPILER=clang-4.0 STL=libc++
+    install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+      travis/install_osx.sh
+    os: osx
+    osx_image: xcode8
+    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+      travis/postsubmit.sh DefaultDebug
  - compiler: clang
-    env: COMPILER=clang-4.0 STL=libc++ TEST=DebugPlain
+    env: TEST=DefaultRelease COMPILER=clang-4.0 STL=libc++
    install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
      travis/install_osx.sh
    os: osx
    osx_image: xcode8
    script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-      travis/postsubmit.sh DebugPlain
-#  - compiler: clang
-#    env: COMPILER=clang-default STL=libc++ TEST=DebugPlain
-#    install: export OS=osx; export COMPILER='clang-default'; export STL='libc++';
-#      extras/scripts/travis_ci_install_osx.sh
-#    os: osx
-#    osx_image: xcode8.2
-#    script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh
-#      DebugPlain
+      travis/postsubmit.sh DefaultRelease

+# Enable caching
 cache:
  timeout: 600
  directories:
  - build
  - travis/mtime_cache

+# Enable docker support
 services:
 - docker
 sudo: required
--- a/travis/postsubmit-helper.sh
+++ b/travis/postsubmit-helper.sh
@ -95,8 +95,8 @@ echo C++ Standard library location: $(echo '#include <vector>' | $CXX -x c++ -E
 echo Normalized C++ Standard library location: $(readlink -f $(echo '#include <vector>' | $CXX -x c++ -E - | grep 'vector\"' | awk '{print $3}' | sed 's@/vector@@;s@\"@@g' | head -n 1))

 case "$1" in
-DebugPlain)           CMAKE_ARGS=(-DCMAKE_BUILD_TYPE=Debug   -DCMAKE_CXX_FLAGS="$STLARG") ;;
-ReleasePlain)         CMAKE_ARGS=(-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="$STLARG") ;;
+DefaultDebug)           CMAKE_ARGS=(-DCMAKE_BUILD_TYPE=Debug   -DCMAKE_CXX_FLAGS="$STLARG") ;;
+DefaultRelease)         CMAKE_ARGS=(-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="$STLARG") ;;
 *) echo "Error: you need to specify one of the supported postsubmit modes (see postsubmit.sh)."; exit 1 ;;
 esac