Skip to content

Commit d3cf72b

Browse files
authored
Merge pull request #38721 from apple/update-xcode-13-beta4-5.5
Update the Xcode version to support Xcode 13 beta 4
2 parents a1f64c7 + 250fd5f commit d3cf72b

26 files changed

+2771
-3139
lines changed

test/lit.cfg

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def get_simulator_command(run_os, run_cpu, sdk_path):
9797
else:
9898
return "simctl spawn --standalone 'iPhone 8'"
9999
elif run_os == 'tvos':
100-
return "simctl spawn --standalone 'Apple TV 4K'"
100+
return "simctl spawn --standalone 'Apple TV'"
101101
elif run_os == 'watchos':
102102
if run_cpu == "i386":
103103
if min(darwin_get_watchos_sim_vers()) > 6.2:
@@ -2128,6 +2128,13 @@ config.substitutions.append(('%FileCheck', run_filecheck))
21282128
config.substitutions.append(('%raw-FileCheck', shell_quote(config.filecheck)))
21292129
config.substitutions.append(('%import-libdispatch', getattr(config, 'import_libdispatch', '')))
21302130

2131+
# Disabe COW sanity checks in the swift runtime by default.
2132+
# (But it's required to set this environment variable to something)
2133+
config.environment['SWIFT_DEBUG_ENABLE_COW_CHECKS'] = 'false'
2134+
2135+
# Add this to the command which runs an executable to enable COW checks in the swift runtime.
2136+
config.substitutions.append(('%enable-cow-checking', TARGET_ENV_PREFIX + 'SWIFT_DEBUG_ENABLE_COW_CHECKS=true;'))
2137+
21312138
if config.lldb_build_root != "":
21322139
lldb_python_path = get_lldb_python_path(config.lldb_build_root)
21332140
lldb_python_interpreter = get_lldb_python_interpreter(config.lldb_build_root)
@@ -2152,9 +2159,6 @@ config.environment[TARGET_ENV_PREFIX + 'SWIFT_DETERMINISTIC_HASHING'] = '1'
21522159
# Enable malloc scribble during tests by default.
21532160
config.environment[TARGET_ENV_PREFIX + 'SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE'] = 'YES'
21542161

2155-
# Enable COW sanity checks in the swift runtime by default.
2156-
config.environment['SWIFT_DEBUG_ENABLE_COW_CHECKS'] = 'true'
2157-
21582162
# Run lsb_release on the target to be tested and return the results.
21592163
def linux_get_lsb_release():
21602164
lsb_release_path = '/usr/bin/lsb_release'

0 commit comments

Comments
 (0)