commit cdce50bda3603770cc4ef80cbb613c78b8e47a17
author Pirama Arumuga Nainar <pirama@google.com> Wed Jul 01 12:26:56 2015 -0700
committer Stephen Hines <srhines@google.com> Thu Aug 13 13:33:03 2015 -0700
tree 671adfff40ebd375143df646ff9030936fb4f4ae
parent 779923ae7782a8a7f62b0bc2b2282c136a5a34b9

Update aosp/master compiler-rt for rebase to r239765

Change-Id: I722dcde07e4f76a8a35ca701d89be5f311840e74

test/asan/TestCases/use-after-scope.cc

diff --git a/test/asan/TestCases/use-after-scope.cc b/test/asan/TestCases/use-after-scope.cc
index f98a8e6..e244ee3 100644
--- a/test/asan/TestCases/use-after-scope.cc
+++ b/test/asan/TestCases/use-after-scope.cc
@@ -1,6 +1,6 @@
 // RUN: %clangxx_asan -O0 -fsanitize=use-after-scope %s -o %t && \
 // RUN: not %run %t 2>&1 | FileCheck %s
-// RUN: env ASAN_OPTIONS="detect_stack_use_after_return=1" not %run %t 2>&1 | FileCheck %s
+// RUN: env ASAN_OPTIONS="$ASAN_OPTIONS:detect_stack_use_after_return=1" not %run %t 2>&1 | FileCheck %s
 // XFAIL: *
 
 int main() {