From f76d38b701f043f391809a9fd181e27b56fca112 Mon Sep 17 00:00:00 2001 From: Jerry Marino Date: Wed, 31 Jul 2019 13:16:30 -0700 Subject: [PATCH 1/3] Add standalone flag for logic tests Under Xcode 11 Beta 5 this is required --- test_runner/logic_test_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_runner/logic_test_util.py b/test_runner/logic_test_util.py index cd0a54a..8034366 100644 --- a/test_runner/logic_test_util.py +++ b/test_runner/logic_test_util.py @@ -49,7 +49,7 @@ def RunLogicTestOnSim( simctl_env_vars[_SIMCTL_ENV_VAR_PREFIX + key] = env_vars[key] simctl_env_vars['NSUnbufferedIO'] = 'YES' command = [ - 'xcrun', 'simctl', 'spawn', sim_id, + 'xcrun', 'simctl', 'spawn', '--standalone', sim_id, xcode_info_util.GetXctestToolPath(ios_constants.SDK.IPHONESIMULATOR)] if args: command += args From f3d8aaed2a92c94038370f672e56e54afbb57516 Mon Sep 17 00:00:00 2001 From: Jerry Marino Date: Wed, 31 Jul 2019 13:43:26 -0700 Subject: [PATCH 2/3] Add --standalone for Xcode 11 and greater --- test_runner/logic_test_util.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test_runner/logic_test_util.py b/test_runner/logic_test_util.py index 8034366..64150fb 100644 --- a/test_runner/logic_test_util.py +++ b/test_runner/logic_test_util.py @@ -48,9 +48,14 @@ def RunLogicTestOnSim( for key in env_vars: simctl_env_vars[_SIMCTL_ENV_VAR_PREFIX + key] = env_vars[key] simctl_env_vars['NSUnbufferedIO'] = 'YES' - command = [ - 'xcrun', 'simctl', 'spawn', '--standalone', sim_id, + + command = ['xcrun', 'simctl', 'spawn'] + if xcode_info_util.GetXcodeVersionNumber() >= 1100: + command.extend('--standalone') + + command += [sim_id, xcode_info_util.GetXctestToolPath(ios_constants.SDK.IPHONESIMULATOR)] + if args: command += args if not tests_to_run: From a54b6f29bde865df31ced3906c6adbbb19b8fce8 Mon Sep 17 00:00:00 2001 From: Jerry Marino Date: Wed, 31 Jul 2019 17:27:10 -0700 Subject: [PATCH 3/3] Revert "Add --standalone for Xcode 11 and greater" This reverts commit f3d8aaed2a92c94038370f672e56e54afbb57516. --- test_runner/logic_test_util.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test_runner/logic_test_util.py b/test_runner/logic_test_util.py index 64150fb..8034366 100644 --- a/test_runner/logic_test_util.py +++ b/test_runner/logic_test_util.py @@ -48,14 +48,9 @@ def RunLogicTestOnSim( for key in env_vars: simctl_env_vars[_SIMCTL_ENV_VAR_PREFIX + key] = env_vars[key] simctl_env_vars['NSUnbufferedIO'] = 'YES' - - command = ['xcrun', 'simctl', 'spawn'] - if xcode_info_util.GetXcodeVersionNumber() >= 1100: - command.extend('--standalone') - - command += [sim_id, + command = [ + 'xcrun', 'simctl', 'spawn', '--standalone', sim_id, xcode_info_util.GetXctestToolPath(ios_constants.SDK.IPHONESIMULATOR)] - if args: command += args if not tests_to_run: