Travis: Refine and clean-up in stages.

Author: marek-trtik

.travis.yml

@@ -39,8 +39,11 @@ jobs:
             - libubsan0
       before_install:
         - mkdir bin ; ln -s /usr/bin/gcc-5 bin/gcc
-      # env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer"
-      env: COMPILER="g++-5"
+      env:
+        - COMPILER="g++-5"
+        - BUILD_TYPE="Release"
+        - RUN_CBMC_TESTS="true"
+        - RUN_SECURITY_TESTS="true"
 
 # LOCAL CHANGES: Added 'ant' to the OSX package list (needed by security-scanner regression tests)
 
@@ -55,7 +58,11 @@ jobs:
         - mkdir bin ; ln -s /usr/bin/gcc bin/gcc
         - HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ant
         - export PATH=/usr/local/opt/ccache/libexec:$PATH
-      env: COMPILER="g++"
+      env:
+        - COMPILER="g++"
+        - BUILD_TYPE="Release"
+        - RUN_CBMC_TESTS="true"
+        - RUN_SECURITY_TESTS="true"
 
     # OS X using clang++
     - stage: Test different OS/CXX/Flags
@@ -67,12 +74,16 @@ jobs:
         - HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ant
         - export PATH=/usr/local/opt/ccache/libexec:$PATH
       env:
-        - COMPILER="clang++ -Qunused-arguments -fcolor-diagnostics"
+        - COMPILER="clang++"
+        - BUILD_TYPE="Release"
+        - RUN_CBMC_TESTS="true"
+        - RUN_SECURITY_TESTS="true"
         - CCACHE_CPP2=yes
 
     # Ubuntu Linux with glibc using g++-5, debug mode
     - stage: Test different OS/CXX/Flags
       os: linux
+      dist: trusty
       sudo: false
       compiler: gcc
       cache: ccache
@@ -82,19 +93,24 @@ jobs:
             - ubuntu-toolchain-r-test
           packages:
             - libwww-perl
+            - libthread-pool-simple-perl
             - g++-5
             - libubsan0
+            - parallel
       before_install:
         - mkdir bin ; ln -s /usr/bin/gcc-5 bin/gcc
-      # env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer"
       env:
         - COMPILER="g++-5"
-        - EXTRA_CXXFLAGS="-DDEBUG"
-      script: echo "Not running any tests for a debug build."
+        - BUILD_TYPE="Debug"
+        - RUN_CBMC_TESTS="false"
+        - RUN_SECURITY_TESTS="true"
+        - OS="ubuntu"
+        - TEST_MODELS_LIB="false"
 
     # Ubuntu Linux with glibc using clang++-3.7
     - stage: Test different OS/CXX/Flags
       os: linux
+      dist: trusty
       sudo: false
       compiler: clang
       cache: ccache
@@ -105,16 +121,21 @@ jobs:
             - llvm-toolchain-precise-3.7
           packages:
             - libwww-perl
+            - libthread-pool-simple-perl
             - clang-3.7
             - libstdc++-5-dev
             - libubsan0
+            - parallel
       before_install:
         - mkdir bin ; ln -s /usr/bin/clang-3.7 bin/gcc
         - export CCACHE_CPP2=yes
-      # env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
       env:
-        - COMPILER="clang++-3.7 -Qunused-arguments -fcolor-diagnostics"
+        - COMPILER="clang++-3.7"
+        - BUILD_TYPE="Release"
+        - RUN_CBMC_TESTS="true"
+        - RUN_SECURITY_TESTS="true"
         - CCACHE_CPP2=yes
+        - OS="ubuntu"
 
     # Ubuntu Linux with glibc using clang++-3.7, debug mode
     - stage: Test different OS/CXX/Flags
@@ -135,39 +156,13 @@ jobs:
       before_install:
         - mkdir bin ; ln -s /usr/bin/clang-3.7 bin/gcc
         - export CCACHE_CPP2=yes
-      # env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
       env:
-        - COMPILER="clang++-3.7 -Qunused-arguments -fcolor-diagnostics"
+        - COMPILER="clang++-3.7"
+        - BUILD_TYPE="Debug"
+        - RUN_CBMC_TESTS="false"
+        - RUN_SECURITY_TESTS="true"
         - CCACHE_CPP2=yes
         - EXTRA_CXXFLAGS="-DDEBUG"
-      script: echo "Not running any tests for a debug build."
-
-    - stage: Test different OS/CXX/Flags
-      os: linux
-      cache: ccache
-      env:
-        - BUILD_SYSTEM=cmake
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
-      install:
-        - cmake -Hcbmc -Bcbmc/build '-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_COMPILER=g++-5'
-        - cmake --build cbmc/build -- -j4
-      script: (cd cbmc/build; ctest -V -L CORE)
-
-    - stage: Test different OS/CXX/Flags
-      os: osx
-      cache: ccache
-      env:
-        - BUILD_SYSTEM=cmake
-        - CCACHE_CPP2=yes
-      install:
-        - cmake -Hcbmc -Bcbmc/build '-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_OSX_ARCHITECTURES=x86_64'
-        - cmake --build cbmc/build -- -j4
-      script: (cd cbmc/build; ctest -V -L CORE)
 
 
   allow_failures:
@@ -178,7 +173,7 @@ jobs:
 
 install:
   - ccache --max-size=1G
-  - cmake . -Bbuild "-DCMAKE_CXX_COMPILER=${COMPILER}" "-Denable_security_tests=true" "-Denable_cbmc_tests=false"
+  - cmake . -Bbuild "-DCMAKE_CXX_COMPILER=${COMPILER}" "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" "-Denable_security_tests=${RUN_SECURITY_TESTS}" "-Denable_cbmc_tests=${RUN_CBMC_TESTS}"
   - ( cd build; make install )
 
 # LOCAL CHANGES: Added cbmc/ prefix, and added unit and regression tests to the end of the list.