Add DEVELOPER_DIR env back to execute logic test

This change was from 67100a8 and removed in 7f8fc81.
google · Nov 1, 2021 · a13ec9d · a13ec9d · brentleyjones · Nov 1, 2021
1 parent 7f8fc81
commit a13ec9d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/test_runner/logic_test_util.py b/test_runner/logic_test_util.py
@@ -14,6 +14,7 @@
 
 """The helper classes to run logic test."""
 
+import os
 import subprocess
 import sys
 
@@ -62,6 +63,10 @@ def RunLogicTestOnSim(sim_id,
       version_util.GetVersionNumber(os_version) < 1220):
     key = _SIMCTL_ENV_VAR_PREFIX + 'DYLD_FALLBACK_LIBRARY_PATH'
     simctl_env_vars[key] = xcode_info_util.GetSwift5FallbackLibsDir()
+  # We need to set the DEVELOPER_DIR to ensure xcrun works correctly
+  developer_dir = os.environ.get('DEVELOPER_DIR')
+  if developer_dir:
+    simctl_env_vars['DEVELOPER_DIR'] = developer_dir
   command = [
       'xcrun', 'simctl', 'spawn', '-s', sim_id,
       xcode_info_util.GetXctestToolPath(ios_constants.SDK.IPHONESIMULATOR)]