Change Travis CI tests to use Ubuntu 17.04 instead of 16.04 and Clang…

… 4.0 instead of 3.9.
google · Apr 15, 2017 · 4c5d6d3 · 4c5d6d3
1 parent 0e7cb0e
commit 4c5d6d3
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 70 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,37 +10,37 @@ matrix:
   fast_finish: true
   include:
   - compiler: gcc
-    env: COMPILER=gcc-6 UBUNTU=16.04 TEST=DebugValgrind
-    install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=gcc-6 UBUNTU=17.04 TEST=DebugValgrind
+    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='16.04'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/postsubmit.sh
       DebugValgrind
   - compiler: gcc
-    env: COMPILER=gcc-6 UBUNTU=16.04 TEST=DebugPlain
-    install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
+    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='16.04'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/postsubmit.sh
       DebugPlain
   - compiler: gcc
-    env: COMPILER=gcc-6 UBUNTU=16.04 TEST=ReleasePlain
-    install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
+    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='16.04'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/postsubmit.sh
       ReleasePlain
   - compiler: clang
-    env: COMPILER=clang-3.9 STL=libstdc++ UBUNTU=16.04 TEST=DebugPlain
-    install: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++';
-      export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
+    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-3.9'; export STL='libstdc++';
-      export UBUNTU='16.04'; extras/scripts/postsubmit.sh DebugPlain
+    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-3.9 STL=libstdc++ UBUNTU=16.04 TEST=ReleasePlain
-    install: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++';
-      export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
+    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-3.9'; export STL='libstdc++';
-      export UBUNTU='16.04'; extras/scripts/postsubmit.sh ReleasePlain
+    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=bazel UBUNTU=16.04
     install: export OS=linux; export COMPILER='bazel'; export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
@@ -71,56 +71,38 @@ matrix:
     script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh
       DebugPlain
   - compiler: gcc
-    env: COMPILER=gcc-6 UBUNTU=16.04 TEST=ReleaseValgrind
-    install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
-    os: linux
-    script: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='16.04'; extras/scripts/postsubmit.sh
-      ReleaseValgrind
-  - compiler: gcc
-    env: COMPILER=gcc-6 UBUNTU=16.04 TEST=DebugAsanUbsanNoPch
-    install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
-    os: linux
-    script: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='16.04'; extras/scripts/postsubmit.sh
-      DebugAsanUbsanNoPch
-  - compiler: gcc
-    env: COMPILER=gcc-5 UBUNTU=16.04 TEST=DebugValgrind
-    install: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=gcc-6 UBUNTU=17.04 TEST=ReleaseValgrind
+    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-5'; export UBUNTU='16.04'; extras/scripts/postsubmit.sh
-      DebugValgrind
-  - compiler: gcc
-    env: COMPILER=gcc-5 UBUNTU=16.04 TEST=ReleaseValgrind
-    install: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
-    os: linux
-    script: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='16.04'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/postsubmit.sh
       ReleaseValgrind
   - compiler: gcc
-    env: COMPILER=gcc-5 UBUNTU=16.04 TEST=DebugAsanUbsanNoPch
-    install: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=gcc-6 UBUNTU=17.04 TEST=DebugAsanUbsan
+    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-5'; export UBUNTU='16.04'; extras/scripts/postsubmit.sh
-      DebugAsanUbsanNoPch
+    script: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/postsubmit.sh
+      DebugAsanUbsan
   - compiler: clang
-    env: COMPILER=clang-3.9 STL=libstdc++ UBUNTU=16.04 TEST=DebugValgrind
-    install: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++';
-      export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=clang-4.0 STL=libstdc++ UBUNTU=17.04 TEST=DebugValgrind
+    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-3.9'; export STL='libstdc++';
-      export UBUNTU='16.04'; extras/scripts/postsubmit.sh DebugValgrind
+    script: export OS=linux; export COMPILER='clang-4.0'; export STL='libstdc++';
+      export UBUNTU='17.04'; extras/scripts/postsubmit.sh DebugValgrind
   - compiler: clang
-    env: COMPILER=clang-3.9 STL=libstdc++ UBUNTU=16.04 TEST=ReleaseValgrind
-    install: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++';
-      export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=clang-4.0 STL=libstdc++ UBUNTU=17.04 TEST=ReleaseValgrind
+    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-3.9'; export STL='libstdc++';
-      export UBUNTU='16.04'; extras/scripts/postsubmit.sh ReleaseValgrind
+    script: export OS=linux; export COMPILER='clang-4.0'; export STL='libstdc++';
+      export UBUNTU='17.04'; extras/scripts/postsubmit.sh ReleaseValgrind
   - compiler: clang
-    env: COMPILER=clang-3.9 STL=libstdc++ UBUNTU=16.04 TEST=DebugAsanUbsan
-    install: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++';
-      export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=clang-4.0 STL=libstdc++ UBUNTU=17.04 TEST=DebugAsanUbsan
+    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-3.9'; export STL='libstdc++';
-      export UBUNTU='16.04'; extras/scripts/postsubmit.sh DebugAsanUbsan
+    script: export OS=linux; export COMPILER='clang-4.0'; export STL='libstdc++';
+      export UBUNTU='17.04'; extras/scripts/postsubmit.sh DebugAsanUbsan
   - compiler: gcc
     env: COMPILER=gcc-4.8 UBUNTU=14.04 TEST=DebugValgrindNoPch
     install: export OS=linux; export COMPILER='gcc-4.8'; export UBUNTU='14.04'; extras/scripts/travis_ci_install_linux.sh

diff --git a/extras/scripts/travis_yml_generator.py b/extras/scripts/travis_yml_generator.py
@@ -143,17 +143,8 @@ def add_bazel_tests(ubuntu_version, smoke_tests=[]):
   else:
     build_matrix_rows.append(test_environment)
 
-
-add_ubuntu_tests(ubuntu_version='16.04', compiler='gcc-6', smoke_tests=['DebugPlain', 'DebugValgrind', 'ReleasePlain'],
-                 exclude_tests=['DebugAsanUbsan'])
-# We can't use PCHs in tests with Ubsan with GCC <6.3.0, it doesn't work. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66343.
-add_ubuntu_tests(ubuntu_version='16.04', compiler='gcc-6', smoke_tests=['DebugPlain', 'DebugValgrind', 'ReleasePlain'],
-                 include_only_tests=['DebugAsanUbsan'], use_precompiled_headers_in_tests=False)
-add_ubuntu_tests(ubuntu_version='16.04', compiler='gcc-5', exclude_tests=['DebugAsanUbsan'])
-# We can't use PCHs in tests with Ubsan with GCC <6.3.0, it doesn't work. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66343.
-add_ubuntu_tests(ubuntu_version='16.04', compiler='gcc-5',
-                 include_only_tests=['DebugAsanUbsan'], use_precompiled_headers_in_tests=False)
-add_ubuntu_tests(ubuntu_version='16.04', compiler='clang-3.9', stl='libstdc++', smoke_tests=['DebugPlain', 'ReleasePlain'])
+add_ubuntu_tests(ubuntu_version='17.04', compiler='gcc-6', smoke_tests=['DebugPlain', 'DebugValgrind', 'ReleasePlain'])
+add_ubuntu_tests(ubuntu_version='17.04', compiler='clang-4.0', stl='libstdc++', smoke_tests=['DebugPlain', 'ReleasePlain'])
 
 add_bazel_tests(ubuntu_version='16.04', smoke_tests=['DebugPlain'])