commit 17f77e8c32706533c708ad63dffb5562521d6c7d
author Florian Mayer <fmayer@google.com> Tue Oct 02 19:08:36 2018 +0100
committer Primiano Tucci <primiano@google.com> Wed Oct 03 08:12:15 2018 +0000
tree 86cc26229950e2fe50b5dcdc4f6e8b5baad2d96f
parent 980afd6de4e8ee641d003f2cf8a37598d079fb83

Re-enable {a|l}san

Change-Id: Iddcf46bd7c9afbf764569d9388e42b1d953daa2a

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 0603419..7e5ed01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,13 +66,13 @@
       sudo: false
       compiler: clang
       env: CFG=linux_trusty-clang-x86_64-msan GN_ARGS="is_debug=false is_msan=true"
-# TODO(b/117093687): This always times out in Travis.
+# TODO(b/117093687): ubsan always times out in Travis.
 # Re-enable once that is fixed.
-#    - os: linux
-#      dist: trusty
-#      sudo: true
-#      compiler: clang
-#      env: CFG=linux_trusty-clang-x86_64-ubsan_asan_lsan GN_ARGS="is_debug=false is_ubsan=true is_asan=true is_lsan=true"
+    - os: linux
+      dist: trusty
+      sudo: true
+      compiler: clang
+      env: CFG=linux_trusty-clang-x86_64-asan_lsan GN_ARGS="is_debug=false is_asan=true is_lsan=true"
     - os: linux
       dist: trusty
       sudo: false

infra/perfetto-ci.appspot.com/static/index.html

diff --git a/infra/perfetto-ci.appspot.com/static/index.html b/infra/perfetto-ci.appspot.com/static/index.html
index 9f62f40..f9e9eee 100644
--- a/infra/perfetto-ci.appspot.com/static/index.html
+++ b/infra/perfetto-ci.appspot.com/static/index.html
@@ -81,7 +81,7 @@
           <td id="linux_trusty-clang-x86_64-debug">dbg</td>
           <td id="linux_trusty-clang-x86_64-tsan">tsan</td>
           <td id="linux_trusty-clang-x86_64-msan">msan</td>
-          <td id="linux_trusty-clang-x86_64-ubsan_asan_lsan">{a,l,ub}san</td>
+          <td id="linux_trusty-clang-x86_64-asan_lsan">{a,l}san</td>
           <td id="linux_trusty-clang-x86_64-libfuzzer">fuzzer</td>
           <td id="ui-clang-x86_64-debug">dbg</td>
           <td id="ui-clang-x86_64-release">rel</td>