Skip to content

Commit d7a0d58

Browse files
committed
quote in-proc server path
1 parent 0be190b commit d7a0d58

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

test/lit.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,7 +1273,7 @@ if run_vendor == 'apple':
12731273
lit_config.note('Using freestanding resource dir: ' + new_resource_dir)
12741274

12751275
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)
12771277

12781278
# Auto-linking does not work when stdlib is built with LTO, because linked
12791279
# libraries are discovered too late (after optimizations are applied), and
@@ -1626,7 +1626,7 @@ elif run_os in ['windows-msvc']:
16261626
config.target_env_prefix = ''
16271627

16281628
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)
16301630

16311631
config.target_build_swift = \
16321632
('%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-
17601760
config.target_swift_autolink_extract = inferSwiftBinary("swift-autolink-extract")
17611761

17621762
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)
17641764

17651765
libdispatch_artifact_dir = config.libdispatch_build_path
17661766
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:([^)]+)\)',
27292729
SubstituteCaptures(r'%s \1 %s %s' % (
27302730
escape_for_substitute_captures(subst_target_swift_ide_test_mock_sdk),
27312731
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)))))
27332733
config.substitutions.append(('%target-swift-ide-test',
27342734
"%s %s %s" % (config.target_swift_ide_test,
27352735
config.swift_test_options,

0 commit comments

Comments
 (0)