summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Liew <dan@su-root.co.uk>2019-03-21 19:20:44 +0000
committerDan Liew <dan@su-root.co.uk>2019-03-21 19:20:44 +0000
commit5988d72243bc03cb3a0b3f141cf21fd54596bd63 (patch)
tree53b6e3da4ac4c8a386a1363215fbc29fb81e87b2
parentf960351ac4519046ea826a6dc9afe7d2ce37cf57 (diff)
downloadbcm5719-llvm-5988d72243bc03cb3a0b3f141cf21fd54596bd63.tar.gz
bcm5719-llvm-5988d72243bc03cb3a0b3f141cf21fd54596bd63.zip
Enable `asan/TestCases/Posix/start-deactivated.cc` test for iOS.
Summary: To make this test pass it was necesary to change `iossim_run.py` to propagate the `ASAN_ACTIVATION_OPTIONS` environment variable into the testing environment. rdar://problem/49114807 Reviewers: kubamracek, yln, serge-sans-paille Subscribers: #sanitizers, llvm-commits Tags: #sanitizers, #llvm Differential Revision: https://reviews.llvm.org/D59660 llvm-svn: 356701
-rw-r--r--compiler-rt/test/asan/TestCases/Posix/start-deactivated.cc1
-rwxr-xr-xcompiler-rt/test/sanitizer_common/ios_commands/iossim_run.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/compiler-rt/test/asan/TestCases/Posix/start-deactivated.cc b/compiler-rt/test/asan/TestCases/Posix/start-deactivated.cc
index 736d7f698b1..9c674ac57e4 100644
--- a/compiler-rt/test/asan/TestCases/Posix/start-deactivated.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/start-deactivated.cc
@@ -18,7 +18,6 @@
// RUN: %env_asan_opts=start_deactivated=1 \
// RUN: ASAN_ACTIVATION_OPTIONS=help=1,handle_segv=0,verbosity=1 not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-UNSUPPORTED
-// UNSUPPORTED: ios
// END.
diff --git a/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py b/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py
index e1f633e8746..7ce973956f3 100755
--- a/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py
+++ b/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py
@@ -8,7 +8,7 @@ if not "SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER" in os.environ:
device_id = os.environ["SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER"]
-for e in ["ASAN_OPTIONS", "TSAN_OPTIONS", "UBSAN_OPTIONS", "APPLE_ASAN_INIT_FOR_DLOPEN"]:
+for e in ["ASAN_OPTIONS", "TSAN_OPTIONS", "UBSAN_OPTIONS", "APPLE_ASAN_INIT_FOR_DLOPEN", "ASAN_ACTIVATION_OPTIONS"]:
if e in os.environ:
os.environ["SIMCTL_CHILD_" + e] = os.environ[e]
OpenPOWER on IntegriCloud