From a6ae39893b424a90b81efe955a26a38e382fcd95 Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@google.com>
Date: Fri, 21 Jun 2019 09:17:15 -0700
Subject: [PATCH] [travis] set default build env to xenial (#3943)

---
 .travis.yml               | 36 ++++++++----------------------------
 .travis/before_install.sh | 11 +----------
 .travis/script.sh         | 12 +++++++-----
 3 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 35c495a1d..4ac85c5a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ language: python
 python: "3.6"
 
 sudo: required
-dist: trusty
+dist: xenial
 
 before_install:
   - travis_retry .travis/before_install.sh
@@ -51,7 +51,7 @@ matrix:
     - env: BUILD_TARGET="posix-app-cli" VERBOSE=1 VIRTUAL_TIME=1
       os: linux
       compiler: gcc
-    - env: BUILD_TARGET="posix-app-pty" CC=clang CXX=clang++ VERBOSE=1 COVERAGE=1
+    - env: BUILD_TARGET="posix-app-pty" VERBOSE=1 COVERAGE=1
       os: linux
       compiler: clang
     - env: BUILD_TARGET="posix-app-pty" DAEMON=1 VERBOSE=1 COVERAGE=1
@@ -59,16 +59,11 @@ matrix:
       compiler: gcc
     - env: BUILD_TARGET="android-build" VERBOSE=1
       os: linux
+      dist: trusty
       python: "2.7"
-    - env: BUILD_TARGET="posix-distcheck" CC=clang-6.0 CXX=clang++-6.0 VERBOSE=1 VIRTUAL_TIME=1
+    - env: BUILD_TARGET="posix-distcheck" VERBOSE=1 VIRTUAL_TIME=1
       os: linux
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-trusty-6.0
-            - ubuntu-toolchain-r-test
-          packages:
-            - clang-6.0
+      compiler: clang
     - env: BUILD_TARGET="posix-32-bit" VERBOSE=1 VIRTUAL_TIME=1
       os: linux
       compiler: gcc
@@ -91,19 +86,13 @@ matrix:
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-6.0
+            - llvm-toolchain-xenial-6.0
             - ubuntu-toolchain-r-test
           packages:
             - clang-format-6.0
-    - env: BUILD_TARGET="scan-build" CC="clang-6.0" CXX="clang++-6.0"
+    - env: BUILD_TARGET="scan-build"
       os: linux
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-trusty-6.0
-            - ubuntu-toolchain-r-test
-          packages:
-            - clang-6.0
+      compiler: clang
     - env: BUILD_TARGET="arm-gcc-4"
       os: linux
       compiler: gcc
@@ -119,15 +108,6 @@ matrix:
     - env: BUILD_TARGET="arm-gcc-8"
       os: linux
       compiler: gcc
-    - env: BUILD_TARGET="posix" CC=clang-6.0 CXX=clang++-6.0
-      os: linux
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-trusty-6.0
-            - ubuntu-toolchain-r-test
-          packages:
-            - clang-6.0
     - env: BUILD_TARGET="posix" CC="gcc-5" CXX="g++-5"
       os: linux
       compiler: gcc
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index dd8fb9a05..561dfc8bb 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -85,10 +85,6 @@ cd /tmp || die
         ) || die
     }
 
-    [ $BUILD_TARGET != scan-build ] || {
-        sudo apt-get install clang || die
-    }
-
     [ $BUILD_TARGET != arm-gcc-4 ] || {
         sudo apt-get install lib32z1 || die
         wget https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 || die
@@ -136,12 +132,7 @@ cd /tmp || die
     }
 
     [ $BUILD_TARGET != posix-distcheck ] || {
-        sudo apt-get install clang || die
-        sudo apt-get install llvm-3.4-runtime || die
-    }
-
-    [ $BUILD_TARGET != posix -o "$CC" != clang ] || {
-        sudo apt-get install clang || die
+        sudo apt-get install llvm-runtime || die
     }
 
     [ $BUILD_TARGET != toranj-test-framework ] || {
diff --git a/.travis/script.sh b/.travis/script.sh
index 35b095387..e81f1e014 100755
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -50,12 +50,16 @@ python --version || die
     ./bootstrap || die
 
     export CPPFLAGS="-DMBEDTLS_DEBUG_C"
+    export CPPFLAGS="${CPPFLAGS} -I${TRAVIS_BUILD_DIR}/third_party/mbedtls"
+    export CPPFLAGS="${CPPFLAGS} -I${TRAVIS_BUILD_DIR}/third_party/mbedtls/repo/include"
+    export CPPFLAGS="${CPPFLAGS} -DMBEDTLS_CONFIG_FILE=\\\"mbedtls-config.h\\\""
 
     scan-build ./configure                \
         --enable-application-coap         \
         --enable-application-coap-secure  \
         --enable-border-agent             \
         --enable-border-router            \
+        --enable-builtin-mbedtls=no       \
         --enable-cert-log                 \
         --enable-channel-manager          \
         --enable-channel-monitor          \
@@ -67,6 +71,7 @@ python --version || die
         --enable-diag                     \
         --enable-dns-client               \
         --enable-ecdsa                    \
+        --enable-executable=no            \
         --enable-ftd                      \
         --enable-jam-detection            \
         --enable-joiner                   \
@@ -83,7 +88,7 @@ python --version || die
         --enable-udp-forward              \
         --with-examples=posix || die
 
-    scan-build --status-bugs -analyze-headers -v make || die
+    scan-build --status-bugs -analyze-headers -v make -j2 || die
 }
 
 [ $BUILD_TARGET != android-build ] || {
@@ -324,9 +329,6 @@ build_samr21() {
 }
 
 [ $BUILD_TARGET != posix ] || {
-    sh -c '$CC --version' || die
-    sh -c '$CXX --version' || die
-
     git checkout -- . || die
     git clean -xfd || die
     ./bootstrap || die
@@ -394,7 +396,7 @@ build_samr21() {
 }
 
 [ $BUILD_TARGET != posix-distcheck ] || {
-    export ASAN_SYMBOLIZER_PATH=`which llvm-symbolizer-5.0` || die
+    export ASAN_SYMBOLIZER_PATH=`which llvm-symbolizer` || die
     export ASAN_OPTIONS=symbolize=1 || die
     export DISTCHECK_CONFIGURE_FLAGS= CPPFLAGS=-DOPENTHREAD_POSIX_VIRTUAL_TIME=1 || die
     ./bootstrap || die