Shortened travis script

2015-05-15 12:36:17 +03:00
parent 6c7f4ed318
commit 8c4096cf2c
1 changed files with 2 additions and 54 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,63 +27,11 @@ matrix:
            - ubuntu-toolchain-r-test
            - llvm-toolchain-precise-3.5

-    - env: CLANG_VERSION=3.5 BUILD_TYPE=Release CPP=11 ASAN=On LIBCXX=On
-      os: linux
-      addons: *clang35
-    - env: CLANG_VERSION=3.5 BUILD_TYPE=Debug CPP=14 ASAN=On LIBCXX=On
-      os: linux
-      addons: *clang35
-    - env: CLANG_VERSION=3.5 BUILD_TYPE=Release CPP=14 ASAN=On LIBCXX=On
-      os: linux
-      addons: *clang35
 
-    - env: CLANG_VERSION=3.5 BUILD_TYPE=Debug CPP=11 ASAN=Off LIBCXX=On
-      os: linux
-      addons: *clang35
    - env: CLANG_VERSION=3.5 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=On
      os: linux
      addons: *clang35
-    - env: CLANG_VERSION=3.5 BUILD_TYPE=Debug CPP=14 ASAN=Off LIBCXX=On
-      os: linux
-      addons: *clang35
-    - env: CLANG_VERSION=3.5 BUILD_TYPE=Release CPP=14 ASAN=Off LIBCXX=On
-      os: linux
-      addons: *clang35
    
-    # Test clang-3.6: C++11/C++14, Buidd=Debug/Release, ASAN=On/Off
-    - env: CLANG_VERSION=3.6 BUILD_TYPE=Debug CPP=11 ASAN=On LIBCXX=On
-      os: linux
-      addons: &clang36
-        apt:
-          packages:
-            - clang-3.6
-            - valgrind
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.6
-
-    - env: CLANG_VERSION=3.6 BUILD_TYPE=Release CPP=11 ASAN=On LIBCXX=On
-      os: linux
-      addons: *clang36
-    - env: CLANG_VERSION=3.6 BUILD_TYPE=Debug CPP=14 ASAN=On LIBCXX=On
-      os: linux
-      addons: *clang36
-    - env: CLANG_VERSION=3.6 BUILD_TYPE=Release CPP=14 ASAN=On LIBCXX=On
-      os: linux
-      addons: *clang36
-
-    - env: CLANG_VERSION=3.6 BUILD_TYPE=Debug CPP=11 ASAN=Off LIBCXX=On
-      os: linux
-      addons: *clang36
-    - env: CLANG_VERSION=3.6 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=On
-      os: linux
-      addons: *clang36
-    - env: CLANG_VERSION=3.6 BUILD_TYPE=Debug CPP=14 ASAN=Off LIBCXX=On
-      os: linux
-      addons: *clang36
-    - env: CLANG_VERSION=3.6 BUILD_TYPE=Release CPP=14 ASAN=Off LIBCXX=On
-      os: linux
-      addons: *clang36

    # Test clang-3.7: C++11/C++14, Buidd=Debug/Release, ASAN=On/Off
    - env: CLANG_VERSION=3.7 BUILD_TYPE=Debug CPP=11 ASAN=On LIBCXX=On