Thank you!<span></span><br><br>On Tuesday, July 7, 2015, Kuba Brecka <<a href="mailto:kuba.brecka@gmail.com">kuba.brecka@gmail.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: kuba.brecka<br>
Date: Tue Jul  7 04:55:00 2015<br>
New Revision: 241571<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D241571-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=j3tEvkehWQDoIEIrPNMFIrP3Bcf0hd-IeoiqVEL0twA&s=xi_mLcaE5zBaMvwD2yywWn5RuKJKY5DhlDDSMYPw-qU&e=" target="_blank">http://llvm.org/viewvc/llvm-project?rev=241571&view=rev</a><br>
Log:<br>
[asan] Add missing $ASAN_OPTIONS to some test cases<br>
<br>
Since <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__reviews.llvm.org_D10294&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=j3tEvkehWQDoIEIrPNMFIrP3Bcf0hd-IeoiqVEL0twA&s=Isrgh5gCCwZRjbIggfjtjtwdutDfZE9yw5KDTtL6O5I&e=" target="_blank">http://reviews.llvm.org/D10294</a>, ASan test cases now respect default env. options via `ASAN_OPTION=$ASAN_OPTIONS:additional_options=xxx`.  This patch adds this to a few test cases where it's still missing.<br>
<br>
Differential Revision: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__reviews.llvm.org_D10988&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=j3tEvkehWQDoIEIrPNMFIrP3Bcf0hd-IeoiqVEL0twA&s=obayyZXU1RBHP-ZpOaO9P--tc64uI84OAiMh2YvUdAE&e=" target="_blank">http://reviews.llvm.org/D10988</a><br>
<br>
<br>
Modified:<br>
    compiler-rt/trunk/test/asan/TestCases/sleep_before_dying.c<br>
    compiler-rt/trunk/test/asan/TestCases/strcspn-1.c<br>
    compiler-rt/trunk/test/asan/TestCases/strcspn-2.c<br>
    compiler-rt/trunk/test/asan/TestCases/strpbrk-1.c<br>
    compiler-rt/trunk/test/asan/TestCases/strpbrk-2.c<br>
    compiler-rt/trunk/test/asan/TestCases/strspn-1.c<br>
    compiler-rt/trunk/test/asan/TestCases/strspn-2.c<br>
    compiler-rt/trunk/test/asan/TestCases/strstr-1.c<br>
    compiler-rt/trunk/test/asan/TestCases/strstr-2.c<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/sleep_before_dying.c<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_test_asan_TestCases_sleep-5Fbefore-5Fdying.c-3Frev-3D241571-26r1-3D241570-26r2-3D241571-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=j3tEvkehWQDoIEIrPNMFIrP3Bcf0hd-IeoiqVEL0twA&s=nJgoVLg9H8CXx2b8_qk13obJwy6TkIAfdY1Monpdy_4&e=" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/sleep_before_dying.c?rev=241571&r1=241570&r2=241571&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/sleep_before_dying.c (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/sleep_before_dying.c Tue Jul  7 04:55:00 2015<br>
@@ -1,5 +1,5 @@<br>
 // RUN: %clang_asan -O2 %s -o %t<br>
-// RUN: env ASAN_OPTIONS="sleep_before_dying=1" not %run %t 2>&1 | FileCheck %s<br>
+// RUN: env ASAN_OPTIONS="$ASAN_OPTIONS:sleep_before_dying=1" not %run %t 2>&1 | FileCheck %s<br>
<br>
 #include <stdlib.h><br>
 int main() {<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/strcspn-1.c<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_test_asan_TestCases_strcspn-2D1.c-3Frev-3D241571-26r1-3D241570-26r2-3D241571-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=j3tEvkehWQDoIEIrPNMFIrP3Bcf0hd-IeoiqVEL0twA&s=0Xx7k6_B_D5VVr7q1-JdSaqqQJJpgxTpdRcTq3awSnc&e=" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strcspn-1.c?rev=241571&r1=241570&r2=241571&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/strcspn-1.c (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/strcspn-1.c Tue Jul  7 04:55:00 2015<br>
@@ -1,5 +1,5 @@<br>
 // Test string s1 overflow in strcspn function<br>
-// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
+// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
<br>
 // Test intercept_strspn asan option<br>
 // RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:intercept_strspn=false %run %t 2>&1<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/strcspn-2.c<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_test_asan_TestCases_strcspn-2D2.c-3Frev-3D241571-26r1-3D241570-26r2-3D241571-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=j3tEvkehWQDoIEIrPNMFIrP3Bcf0hd-IeoiqVEL0twA&s=JQRyVUuBcVfwFXA1Tok9a6I1JJSTU11POiaEidRN3K0&e=" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strcspn-2.c?rev=241571&r1=241570&r2=241571&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/strcspn-2.c (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/strcspn-2.c Tue Jul  7 04:55:00 2015<br>
@@ -1,5 +1,5 @@<br>
 // Test stopset overflow in strcspn function<br>
-// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
+// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
<br>
 // Test intercept_strcspn asan option<br>
 // RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:intercept_strspn=false %run %t 2>&1<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/strpbrk-1.c<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_test_asan_TestCases_strpbrk-2D1.c-3Frev-3D241571-26r1-3D241570-26r2-3D241571-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=j3tEvkehWQDoIEIrPNMFIrP3Bcf0hd-IeoiqVEL0twA&s=-JtFFhTc3fK-V1fon_6Hi3n-r-GQFiiTmAJVhSbGkUc&e=" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strpbrk-1.c?rev=241571&r1=241570&r2=241571&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/strpbrk-1.c (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/strpbrk-1.c Tue Jul  7 04:55:00 2015<br>
@@ -1,5 +1,5 @@<br>
 // Test string s1 overflow in strpbrk function<br>
-// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
+// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
<br>
 // Test intercept_strpbrk asan option<br>
 // RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:intercept_strpbrk=false %run %t 2>&1<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/strpbrk-2.c<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_test_asan_TestCases_strpbrk-2D2.c-3Frev-3D241571-26r1-3D241570-26r2-3D241571-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=j3tEvkehWQDoIEIrPNMFIrP3Bcf0hd-IeoiqVEL0twA&s=e2I0NfezgsVMgqWZyTtnfihnQ0nZ7zP9cZzW_47wSuY&e=" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strpbrk-2.c?rev=241571&r1=241570&r2=241571&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/strpbrk-2.c (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/strpbrk-2.c Tue Jul  7 04:55:00 2015<br>
@@ -1,5 +1,5 @@<br>
 // Test stopset overflow in strpbrk function<br>
-// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
+// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
<br>
 // Test intercept_strpbrk asan option<br>
 // RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:intercept_strpbrk=false %run %t 2>&1<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/strspn-1.c<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_test_asan_TestCases_strspn-2D1.c-3Frev-3D241571-26r1-3D241570-26r2-3D241571-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=j3tEvkehWQDoIEIrPNMFIrP3Bcf0hd-IeoiqVEL0twA&s=f4fqQsp-MkBx0m6yYHzNC4uh3vGDRtW2m0Q2endD3Xg&e=" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strspn-1.c?rev=241571&r1=241570&r2=241571&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/strspn-1.c (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/strspn-1.c Tue Jul  7 04:55:00 2015<br>
@@ -1,5 +1,5 @@<br>
 // Test string s1 overflow in strspn function<br>
-// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
+// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
<br>
 // Test intercept_strspn asan option<br>
 // RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:intercept_strspn=false %run %t 2>&1<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/strspn-2.c<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_test_asan_TestCases_strspn-2D2.c-3Frev-3D241571-26r1-3D241570-26r2-3D241571-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=j3tEvkehWQDoIEIrPNMFIrP3Bcf0hd-IeoiqVEL0twA&s=_lRJBZuKYXkpPTH9gfJhol5IOR9JoNB9RP9l43ySdb4&e=" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strspn-2.c?rev=241571&r1=241570&r2=241571&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/strspn-2.c (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/strspn-2.c Tue Jul  7 04:55:00 2015<br>
@@ -1,5 +1,5 @@<br>
 // Test stopset overflow in strspn function<br>
-// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
+// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
<br>
 // Test intercept_strspn asan option<br>
 // RUN: env ASAN_OPTIONS=$ASAN_OPTIONS:intercept_strspn=false %run %t 2>&1<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/strstr-1.c<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_test_asan_TestCases_strstr-2D1.c-3Frev-3D241571-26r1-3D241570-26r2-3D241571-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=j3tEvkehWQDoIEIrPNMFIrP3Bcf0hd-IeoiqVEL0twA&s=XZRmTbfYzUAKDfvcfMMYH-02bIbdFkCkAwfjcPUdDUU&e=" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strstr-1.c?rev=241571&r1=241570&r2=241571&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/strstr-1.c (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/strstr-1.c Tue Jul  7 04:55:00 2015<br>
@@ -1,5 +1,5 @@<br>
 // Test haystack overflow in strstr function<br>
-// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
+// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
<br>
 // Test intercept_strstr asan option<br>
 // Disable other interceptors because strlen may be called inside strstr<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/strstr-2.c<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_test_asan_TestCases_strstr-2D2.c-3Frev-3D241571-26r1-3D241570-26r2-3D241571-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=j3tEvkehWQDoIEIrPNMFIrP3Bcf0hd-IeoiqVEL0twA&s=EEFH_OC1ZtYsYhwqkHkN7sfPNvlh0smrKtNE-nvvXUg&e=" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/strstr-2.c?rev=241571&r1=241570&r2=241571&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/strstr-2.c (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/strstr-2.c Tue Jul  7 04:55:00 2015<br>
@@ -1,5 +1,5 @@<br>
 // Test needle overflow in strstr function<br>
-// RUN: %clang_asan %s -o %t && ASAN_OPTIONS=strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
+// RUN: %clang_asan %s -o %t && env ASAN_OPTIONS=$ASAN_OPTIONS:strict_string_checks=true not %run %t 2>&1 | FileCheck %s<br>
<br>
 // Test intercept_strstr asan option<br>
 // Disable other interceptors because strlen may be called inside strstr<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="javascript:;" onclick="_e(event, &#39;cvml&#39;, &#39;llvm-commits@cs.uiuc.edu&#39;)">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote><br><br>-- <br>  F<br><br>