@@ -1273,7 +1273,7 @@ if run_vendor == 'apple':
1273
1273
lit_config .note ('Using freestanding resource dir: ' + new_resource_dir )
1274
1274
1275
1275
config .swift_in_process_plugin_server_path = make_path (config .swift_lib_dir , 'swift' , 'host' , 'libSwiftInProcPluginServer.dylib' )
1276
- config .swift_test_options += " -in-process-plugin-server-path %s" % config .swift_in_process_plugin_server_path
1276
+ config .swift_test_options += " -in-process-plugin-server-path %s" % shell_quote ( config .swift_in_process_plugin_server_path )
1277
1277
1278
1278
# Auto-linking does not work when stdlib is built with LTO, because linked
1279
1279
# libraries are discovered too late (after optimizations are applied), and
@@ -1626,7 +1626,7 @@ elif run_os in ['windows-msvc']:
1626
1626
config .target_env_prefix = ''
1627
1627
1628
1628
config .swift_in_process_plugin_server_path = make_path (config .swift_bin_dir , 'SwiftInProcPluginServer.dll' )
1629
- config .swift_test_options += " -in-process-plugin-server-path %s" % config .swift_in_process_plugin_server_path
1629
+ config .swift_test_options += " -in-process-plugin-server-path %s" % shell_quote ( config .swift_in_process_plugin_server_path )
1630
1630
1631
1631
config .target_build_swift = \
1632
1632
('%r -target %s %s %s %s %s %s -libc %s' % \
@@ -1760,7 +1760,7 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
1760
1760
config .target_swift_autolink_extract = inferSwiftBinary ("swift-autolink-extract" )
1761
1761
1762
1762
config .swift_in_process_plugin_server_path = make_path (config .swift_lib_dir , 'swift' , 'host' , 'libSwiftInProcPluginServer.so' )
1763
- config .swift_test_options += " -in-process-plugin-server-path %s" % config .swift_in_process_plugin_server_path
1763
+ config .swift_test_options += " -in-process-plugin-server-path %s" % shell_quote ( config .swift_in_process_plugin_server_path )
1764
1764
1765
1765
libdispatch_artifact_dir = config .libdispatch_build_path
1766
1766
libdispatch_swift_module_dir = make_path (libdispatch_artifact_dir , 'src' , 'swift' , 'swift' )
@@ -2729,7 +2729,7 @@ config.substitutions.append(('%target-swift-ide-test\(mock-sdk:([^)]+)\)',
2729
2729
SubstituteCaptures (r'%s \1 %s %s' % (
2730
2730
escape_for_substitute_captures (subst_target_swift_ide_test_mock_sdk ),
2731
2731
escape_for_substitute_captures (subst_target_swift_ide_test_mock_sdk_after ),
2732
- config .swift_test_options ))))
2732
+ escape_for_substitute_captures ( config .swift_test_options ) ))))
2733
2733
config .substitutions .append (('%target-swift-ide-test' ,
2734
2734
"%s %s %s" % (config .target_swift_ide_test ,
2735
2735
config .swift_test_options ,
0 commit comments