Test against Ubuntu 20.10 and Clang 11 (too) in CI tests.

3 files changed, 83 insertions, 40 deletions

diff --git a/.travis.yml b/.travis.yml
index 2b7f4b8..50045e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,18 +10,39 @@ matrix:
   fast_finish: true
   include:
   - compiler: gcc
-    env: COMPILER=gcc-10 UBUNTU=20.04 TEST=ReleasePlain
-    install: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=gcc-10 UBUNTU=20.10 TEST=ReleasePlain
+    install: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.10'; extras/scripts/postsubmit.sh
       ReleasePlain
   - compiler: gcc
-    env: COMPILER=gcc-10 UBUNTU=20.04 TEST=DebugPlain
-    install: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=gcc-10 UBUNTU=20.10 TEST=DebugPlain
+    install: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.10'; extras/scripts/postsubmit.sh
       DebugPlain
   - compiler: clang
+    env: COMPILER=clang-8.0 STL=libstdc++ UBUNTU=20.10 TEST=ReleasePlain
+    install: export OS=linux; export COMPILER='clang-8.0'; export STL='libstdc++';
+      export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh
+    os: linux
+    script: export OS=linux; export COMPILER='clang-8.0'; export STL='libstdc++';
+      export UBUNTU='20.10'; extras/scripts/postsubmit.sh ReleasePlain
+  - compiler: clang
+    env: COMPILER=clang-8.0 STL=libstdc++ UBUNTU=20.10 TEST=DebugAsanUbsan
+    install: export OS=linux; export COMPILER='clang-8.0'; export STL='libstdc++';
+      export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh
+    os: linux
+    script: export OS=linux; export COMPILER='clang-8.0'; export STL='libstdc++';
+      export UBUNTU='20.10'; extras/scripts/postsubmit.sh DebugAsanUbsan
+  - compiler: clang
+    env: COMPILER=clang-8.0 STL=libstdc++ UBUNTU=20.10 TEST=DebugPlain
+    install: export OS=linux; export COMPILER='clang-8.0'; export STL='libstdc++';
+      export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh
+    os: linux
+    script: export OS=linux; export COMPILER='clang-8.0'; export STL='libstdc++';
+      export UBUNTU='20.10'; extras/scripts/postsubmit.sh DebugPlain
+  - compiler: clang
     env: COMPILER=clang-6.0 STL=libstdc++ UBUNTU=20.04 TEST=ReleasePlain
     install: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++';
       export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
@@ -49,51 +70,63 @@ matrix:
     script: export OS=linux; export COMPILER='bazel'; export UBUNTU='18.04'; extras/scripts/postsubmit.sh
       DebugPlain
   - compiler: gcc
-    env: COMPILER=gcc-7 UBUNTU=20.04 TEST=ReleasePlain
-    install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=gcc-7 UBUNTU=20.10 TEST=ReleasePlain
+    install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.10'; extras/scripts/postsubmit.sh
       ReleasePlain
   - compiler: gcc
-    env: COMPILER=gcc-7 UBUNTU=20.04 TEST=DebugAsanUbsan
-    install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=gcc-7 UBUNTU=20.10 TEST=DebugAsanUbsan
+    install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.10'; extras/scripts/postsubmit.sh
       DebugAsanUbsan
   - compiler: gcc
-    env: COMPILER=gcc-10 UBUNTU=20.04 TEST=DebugAsanUbsan
-    install: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=gcc-10 UBUNTU=20.10 TEST=DebugAsanUbsan
+    install: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh
+    script: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.10'; extras/scripts/postsubmit.sh
       DebugAsanUbsan
   - compiler: clang
-    env: COMPILER=clang-10.0 STL=libstdc++ UBUNTU=20.04 TEST=ReleasePlain
-    install: export OS=linux; export COMPILER='clang-10.0'; export STL='libstdc++';
-      export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=clang-11.0 STL=libstdc++ UBUNTU=20.10 TEST=ReleasePlain
+    install: export OS=linux; export COMPILER='clang-11.0'; export STL='libstdc++';
+      export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='clang-10.0'; export STL='libstdc++';
-      export UBUNTU='20.04'; extras/scripts/postsubmit.sh ReleasePlain
+    script: export OS=linux; export COMPILER='clang-11.0'; export STL='libstdc++';
+      export UBUNTU='20.10'; extras/scripts/postsubmit.sh ReleasePlain
   - compiler: clang
-    env: COMPILER=clang-10.0 STL=libstdc++ UBUNTU=20.04 TEST=DebugAsanUbsan
-    install: export OS=linux; export COMPILER='clang-10.0'; export STL='libstdc++';
-      export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=clang-11.0 STL=libstdc++ UBUNTU=20.10 TEST=DebugAsanUbsan
+    install: export OS=linux; export COMPILER='clang-11.0'; export STL='libstdc++';
+      export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='clang-10.0'; export STL='libstdc++';
-      export UBUNTU='20.04'; extras/scripts/postsubmit.sh DebugAsanUbsan
+    script: export OS=linux; export COMPILER='clang-11.0'; export STL='libstdc++';
+      export UBUNTU='20.10'; extras/scripts/postsubmit.sh DebugAsanUbsan
   - compiler: clang
-    env: COMPILER=clang-10.0 STL=libc++ UBUNTU=20.04 TEST=ReleasePlain
-    install: export OS=linux; export COMPILER='clang-10.0'; export STL='libc++'; export
-      UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=clang-11.0 STL=libc++ UBUNTU=20.10 TEST=ReleasePlain
+    install: export OS=linux; export COMPILER='clang-11.0'; export STL='libc++'; export
+      UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='clang-10.0'; export STL='libc++'; export
-      UBUNTU='20.04'; extras/scripts/postsubmit.sh ReleasePlain
+    script: export OS=linux; export COMPILER='clang-11.0'; export STL='libc++'; export
+      UBUNTU='20.10'; extras/scripts/postsubmit.sh ReleasePlain
   - compiler: clang
-    env: COMPILER=clang-10.0 STL=libc++ UBUNTU=20.04 TEST=DebugAsanUbsan
-    install: export OS=linux; export COMPILER='clang-10.0'; export STL='libc++'; export
-      UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
+    env: COMPILER=clang-11.0 STL=libc++ UBUNTU=20.10 TEST=DebugAsanUbsan
+    install: export OS=linux; export COMPILER='clang-11.0'; export STL='libc++'; export
+      UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh
+    os: linux
+    script: export OS=linux; export COMPILER='clang-11.0'; export STL='libc++'; export
+      UBUNTU='20.10'; extras/scripts/postsubmit.sh DebugAsanUbsan
+  - compiler: gcc
+    env: COMPILER=gcc-7 UBUNTU=20.04 TEST=ReleasePlain
+    install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
+    os: linux
+    script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh
+      ReleasePlain
+  - compiler: gcc
+    env: COMPILER=gcc-7 UBUNTU=20.04 TEST=DebugAsanUbsan
+    install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh
     os: linux
-    script: export OS=linux; export COMPILER='clang-10.0'; export STL='libc++'; export
-      UBUNTU='20.04'; extras/scripts/postsubmit.sh DebugAsanUbsan
+    script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh
+      DebugAsanUbsan
   - compiler: gcc
     env: COMPILER=gcc-5 UBUNTU=18.04 TEST=ReleasePlain
     install: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='18.04'; extras/scripts/travis_ci_install_linux.sh
diff --git a/extras/scripts/postsubmit-helper.sh b/extras/scripts/postsubmit-helper.sh
index 7be3b88..ca0aaba 100755
--- a/extras/scripts/postsubmit-helper.sh
+++ b/extras/scripts/postsubmit-helper.sh
@@ -102,6 +102,11 @@ clang-10.0)
     export CXX=clang++-10
     ;;
 
+clang-11.0)
+    export CC=clang-11
+    export CXX=clang++-11
+    ;;
+
 clang-default)
     export CC=clang
     export CXX=clang++
@@ -123,7 +128,9 @@ if [[ "${COMPILER}" != "bazel" ]]
 then
     # This is only needed in OS X but it has no effect on Linux so we can add it unconditionally.
     BOOST_INCLUDE_FLAG="-I /usr/local/include/boost -I /usr/local/include"
-    COMMON_CXX_FLAGS="$STLARG $BOOST_INCLUDE_FLAG -Werror -pedantic -Winvalid-pch"
+    # -Wdtor-name (part of -pedantic) is *very* pedantic. Following that results in weird-looking code.
+    # See https://bugs.llvm.org/show_bug.cgi?id=46979.
+    COMMON_CXX_FLAGS="$STLARG $BOOST_INCLUDE_FLAG -Werror -pedantic -Wno-dtor-name -Winvalid-pch"
 
     echo CXX version: $($CXX --version)
     echo C++ Standard library location: $(echo '#include <vector>' | $CXX -x c++ -E - | grep 'vector\"' | awk '{print $3}' | sed 's@/vector@@;s@\"@@g' | head -n 1)
diff --git a/extras/scripts/travis_yml_generator.py b/extras/scripts/travis_yml_generator.py
index 93a5a1b..46c5a92 100755
--- a/extras/scripts/travis_yml_generator.py
+++ b/extras/scripts/travis_yml_generator.py
@@ -144,14 +144,17 @@ def add_bazel_tests(ubuntu_version, smoke_tests=[]):
     else:
         build_matrix_rows.append(test_environment)
 
+add_ubuntu_tests(ubuntu_version='20.10', compiler='gcc-7')
+add_ubuntu_tests(ubuntu_version='20.10', compiler='gcc-10',
+                 smoke_tests=['DebugPlain', 'ReleasePlain'])
+add_ubuntu_tests(ubuntu_version='20.10', compiler='clang-8.0', stl='libstdc++',
+                 smoke_tests=['DebugPlain', 'DebugAsanUbsan', 'ReleasePlain'])
+add_ubuntu_tests(ubuntu_version='20.10', compiler='clang-11.0', stl='libstdc++')
+add_ubuntu_tests(ubuntu_version='20.10', compiler='clang-11.0', stl='libc++')
 
 add_ubuntu_tests(ubuntu_version='20.04', compiler='gcc-7')
-add_ubuntu_tests(ubuntu_version='20.04', compiler='gcc-10',
-                 smoke_tests=['DebugPlain', 'ReleasePlain'])
 add_ubuntu_tests(ubuntu_version='20.04', compiler='clang-6.0', stl='libstdc++',
                  smoke_tests=['DebugPlain', 'DebugAsanUbsan', 'ReleasePlain'])
-add_ubuntu_tests(ubuntu_version='20.04', compiler='clang-10.0', stl='libstdc++')
-add_ubuntu_tests(ubuntu_version='20.04', compiler='clang-10.0', stl='libc++')
 
 add_ubuntu_tests(ubuntu_version='18.04', compiler='gcc-5', asan=False, ubsan=False)
 add_ubuntu_tests(ubuntu_version='18.04', compiler='gcc-8', asan=False, ubsan=False)