From d847c22e6afe35ee83b62f4501233dd092a4a410 Mon Sep 17 00:00:00 2001
From: Matt Klein <mklein@lyft.com>
Date: Fri, 12 Aug 2016 15:45:58 -0700
Subject: [PATCH 1/2] ci: do asan build

---
 .travis.yml | 1 +
 ci/do_ci.sh | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index af25e25f4fe59..7b8e60d2c5be8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,5 +8,6 @@ install: true
 env:
   - TEST_TYPE=normal
   - TEST_TYPE=coverage
+  - TEST_TYPE=asan
 
 script: docker run -t -i -v $TRAVIS_BUILD_DIR:/source lyft/envoy-build:latest /bin/bash -c "cd /source && ci/do_ci.sh $TEST_TYPE"
diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index 38b0344c35daf..12d0ceb2da321 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -12,6 +12,10 @@ if [[ "$1" == "coverage" ]]; then
   echo "coverage build..."
   EXTRA_CMAKE_FLAGS="-DENVOY_CODE_COVERAGE:BOOL=ON"
   TEST_TARGET="envoy.check-coverage"
+elif [[ "$1" == "asan" ]]; then
+  echo "normal build..."
+  EXTRA_CMAKE_FLAGS="-DENVOY_SANITIZE:BOOL=ON"
+  TEST_TARGET="envoy.check"
 else
   echo "normal build..."
   TEST_TARGET="envoy.check"

From aad8bb8b86d3e0bff066edc01f86a2e388ba210d Mon Sep 17 00:00:00 2001
From: Matt Klein <mklein@lyft.com>
Date: Fri, 12 Aug 2016 15:46:58 -0700
Subject: [PATCH 2/2] fix

---
 ci/do_ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index 12d0ceb2da321..0ac6fe8895883 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -13,7 +13,7 @@ if [[ "$1" == "coverage" ]]; then
   EXTRA_CMAKE_FLAGS="-DENVOY_CODE_COVERAGE:BOOL=ON"
   TEST_TARGET="envoy.check-coverage"
 elif [[ "$1" == "asan" ]]; then
-  echo "normal build..."
+  echo "asan build..."
   EXTRA_CMAKE_FLAGS="-DENVOY_SANITIZE:BOOL=ON"
   TEST_TARGET="envoy.check"
 else