From 635854c28def43ac32296b2c7877fe1611b394d5 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Mon, 18 May 2020 22:16:59 +0100 Subject: [PATCH 1/2] Address lit.cfg upstream review feedback --- test/lit.cfg | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/test/lit.cfg b/test/lit.cfg index 567a4510f4f24..6241be9b2adcd 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -2,7 +2,7 @@ # # This source file is part of the Swift.org open source project # -# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors +# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors # Licensed under Apache License v2.0 with Runtime Library Exception # # See https://swift.org/LICENSE.txt for license information @@ -281,6 +281,7 @@ config.swift_remoteast_test = inferSwiftBinary('swift-remoteast-test') config.swift_indent = inferSwiftBinary('swift-indent') config.swift_symbolgraph_extract = inferSwiftBinary('swift-symbolgraph-extract') config.clang = inferSwiftBinary('clang') +config.clangxx = inferSwiftBinary('clang++') config.llvm_link = inferSwiftBinary('llvm-link') config.swift_llvm_opt = inferSwiftBinary('swift-llvm-opt') config.llvm_profdata = inferSwiftBinary('llvm-profdata') @@ -297,6 +298,8 @@ config.swift_refactor = inferSwiftBinary('swift-refactor') config.swift_demangle_yamldump = inferSwiftBinary('swift-demangle-yamldump') config.benchmark_o = inferSwiftBinary('Benchmark_O') config.benchmark_driver = inferSwiftBinary('Benchmark_Driver') +config.wasmer = inferSwiftBinary('wasmer') +config.wasm_ld = inferSwiftBinary('wasm-ld') config.swift_utils = make_path(config.swift_src_root, 'utils') config.line_directive = make_path(config.swift_utils, 'line-directive') @@ -1377,31 +1380,30 @@ elif run_os == 'wasi': config.target_swift_autolink_extract = inferSwiftBinary("swift-autolink-extract") config.target_build_swift = ' '.join([ - '%s', '-target %s', - '-Xcc --sysroot=%s', '-Xclang-linker --sysroot=%s', - '-tools-directory %s', - '-toolchain-stdlib-rpath %s', '%s %s %s %s' - ]) % (config.swiftc, config.variant_triple, - config.variant_sdk, config.variant_sdk, - tools_directory, resource_dir_opt, - mcp_opt, config.swift_test_options, - config.swift_driver_test_options, swift_execution_tests_extra_flags) + config.swiftc, + '-target', config.variant_triple, + '-Xcc', '--sysroot=%s' % config.variant_sdk, + '-Xclang-linker' '--sysroot=%s' % config.variant_sdk, + '-tools-directory', tools_directory, + '-toolchain-stdlib-rpath', resource_dir_opt, + mcp_opt, config.swift_test_options, + config.swift_driver_test_options, swift_execution_tests_extra_flags]) config.target_codesign = "echo" config.target_build_swift_dylib = ( "%s -parse-as-library -emit-library -o '\\1'" % (config.target_build_swift)) config.target_add_rpath = '' config.target_swift_frontend = ' '.join([ - '%s', '-frontend', '-target %s', - '-Xcc --sysroot=%s', '-tools-directory %s', - '%s %s %s %s ', - ]) % (config.swift, config.variant_triple, - config.variant_sdk, tools_directory, - resource_dir_opt, mcp_opt, - config.swift_test_options, config.swift_frontend_test_options) + config.swift, + '-frontend', + '-target', config.variant_triple, + '-Xcc', '--sysroot=%s' % config.variant_sdk, + '-tools-directory', tools_directory, + resource_dir_opt, mcp_opt, + config.swift_test_options, config.swift_frontend_test_options]) subst_target_swift_frontend_mock_sdk = config.target_swift_frontend subst_target_swift_frontend_mock_sdk_after = "" - config.target_run = 'wasmer run --backend cranelift --' + config.target_run = '%s run --backend cranelift --' % config.wasmer if 'interpret' in lit_config.params: use_interpreter_for_simple_runs() config.target_sil_opt = ( @@ -1427,9 +1429,11 @@ elif run_os == 'wasi': '%s -emit-pcm -target %s' % (config.swiftc, config.variant_triple)) config.target_clang = ( - "clang++ -target %s %s -fobjc-runtime=ios-5.0" % - (config.variant_triple, clang_mcp_opt)) - config.target_ld = "ld -L%r" % (make_path(test_resource_dir, config.target_sdk_name)) + "%s -target %s %s -fobjc-runtime=ios-5.0" % + (config.clangxx, config.variant_triple, clang_mcp_opt)) + config.target_ld = ( + "%s -L%r" % + (config.wasm_ld, make_path(test_resource_dir, config.target_sdk_name))) # The Swift interpreter is not available when targeting WebAssembly/WASI. config.available_features.discard('swift_interpreter') From 4a43b6aebad8015b822d9f9bae8205ee5d16643b Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Tue, 19 May 2020 22:04:46 +0100 Subject: [PATCH 2/2] Fix missing comma in lit.cfg --- test/lit.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/lit.cfg b/test/lit.cfg index 6241be9b2adcd..9707f2671f964 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -1383,7 +1383,7 @@ elif run_os == 'wasi': config.swiftc, '-target', config.variant_triple, '-Xcc', '--sysroot=%s' % config.variant_sdk, - '-Xclang-linker' '--sysroot=%s' % config.variant_sdk, + '-Xclang-linker', '--sysroot=%s' % config.variant_sdk, '-tools-directory', tools_directory, '-toolchain-stdlib-rpath', resource_dir_opt, mcp_opt, config.swift_test_options,