summaryrefslogtreecommitdiff
path: root/test/sanitizer_common
diff options
context:
space:
mode:
authorKuba Mracek <mracek@apple.com>2017-07-10 15:00:55 +0000
committerKuba Mracek <mracek@apple.com>2017-07-10 15:00:55 +0000
commit199c0c91df22a7d749f6910b795d427f84994b42 (patch)
tree4feb5a4a39ac16611ac5558b17d80230de4683e7 /test/sanitizer_common
parent671ef704cfa72856adc7c9a3686a21cb3c1c00ab (diff)
[tsan] Add support for running TSan tests on iOS simulator and devices
Differential Revision: https://reviews.llvm.org/D35157 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@307537 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/sanitizer_common')
-rwxr-xr-xtest/sanitizer_common/ios_commands/iossim_run.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/sanitizer_common/ios_commands/iossim_run.py b/test/sanitizer_common/ios_commands/iossim_run.py
index 732880f35..47b847f53 100755
--- a/test/sanitizer_common/ios_commands/iossim_run.py
+++ b/test/sanitizer_common/ios_commands/iossim_run.py
@@ -8,8 +8,9 @@ if not "SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER" in os.environ:
device_id = os.environ["SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER"]
-if "ASAN_OPTIONS" in os.environ:
- os.environ["SIMCTL_CHILD_ASAN_OPTIONS"] = os.environ["ASAN_OPTIONS"]
+for e in ["ASAN_OPTIONS", "TSAN_OPTIONS"]:
+ if e in os.environ:
+ os.environ["SIMCTL_CHILD_" + e] = os.environ[e]
exitcode = subprocess.call(["xcrun", "simctl", "spawn", device_id] + sys.argv[1:])
if exitcode > 125: