summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-09-23 15:42:04 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-09-23 15:42:04 +0000
commitc07dc68852832a73c21ed55e02bccd4cd28713f1 (patch)
treee062b920d9ae6503117130533a3954228980f5f5
parentc546625c4f7071b721ad50dee2a04593b4e44c18 (diff)
downloadbcm5719-llvm-c07dc68852832a73c21ed55e02bccd4cd28713f1.tar.gz
bcm5719-llvm-c07dc68852832a73c21ed55e02bccd4cd28713f1.zip
[asan] Fix one test on Android-L.
index() is deprecated. llvm-svn: 218312
-rw-r--r--compiler-rt/lib/asan/tests/asan_str_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/tests/asan_str_test.cc b/compiler-rt/lib/asan/tests/asan_str_test.cc
index 7872407005c..1cd2a08b902 100644
--- a/compiler-rt/lib/asan/tests/asan_str_test.cc
+++ b/compiler-rt/lib/asan/tests/asan_str_test.cc
@@ -221,7 +221,8 @@ UNUSED static void RunStrChrTest(PointerToStrChr2 StrChr) {
TEST(AddressSanitizer, StrChrAndIndexOOBTest) {
RunStrChrTest(&strchr);
-#if !defined(_WIN32) // no index() on Windows.
+// No index() on Windows and on Android L.
+#if !defined(_WIN32) && !defined(__ANDROID__)
RunStrChrTest(&index);
#endif
}
OpenPOWER on IntegriCloud