[compiler-rt] cdb4560 - [iOS sim] Simplify iossim_run.py script

Julian Lettner via llvm-commits llvm-commits at lists.llvm.org
Thu Dec 12 17:34:19 PST 2019


Author: Julian Lettner
Date: 2019-12-12T17:34:08-08:00
New Revision: cdb45605571202a1bbc3fe6de300b93da79cea83

URL: https://github.com/llvm/llvm-project/commit/cdb45605571202a1bbc3fe6de300b93da79cea83
DIFF: https://github.com/llvm/llvm-project/commit/cdb45605571202a1bbc3fe6de300b93da79cea83.diff

LOG: [iOS sim] Simplify iossim_run.py script

Added: 
    

Modified: 
    compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py

Removed: 
    


################################################################################
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 7ce973956f3b..ec1ed3c7fe49 100755
--- a/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py
+++ b/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py
@@ -3,11 +3,10 @@
 import glob, os, pipes, sys, subprocess
 
 
-if not "SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER" in os.environ:
+device_id = os.environ.get('SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER')
+if not device_id:
   raise EnvironmentError("Specify SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER to select which simulator to use.")
 
-device_id = os.environ["SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER"]
-
 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]


        


More information about the llvm-commits mailing list