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/dump_instruction_bytes.cc

diff --git a/test/asan/TestCases/dump_instruction_bytes.cc b/test/asan/TestCases/dump_instruction_bytes.cc
index 981e3c3..33f382c 100644
--- a/test/asan/TestCases/dump_instruction_bytes.cc
+++ b/test/asan/TestCases/dump_instruction_bytes.cc
@@ -1,7 +1,7 @@
 // Check that ASan prints the faulting instruction bytes on
 // dump_instruction_bytes=1
 // RUN: %clangxx_asan  %s -o %t
-// RUN: env ASAN_OPTIONS=dump_instruction_bytes=1 not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-DUMP
+// RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:dump_instruction_bytes=1 not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-DUMP
 // RUN: not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-NODUMP
 //
 // REQUIRES: x86_64-supported-target,i386-supported-target