Skip to content

test: address lit.cfg upstream review feedback #1035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 20, 2020
Merged

test: address lit.cfg upstream review feedback #1035

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
635854c
Address lit.cfg upstream review feedback
MaxDesiatov May 18, 2020
4a43b6a
Fix missing comma in lit.cfg
MaxDesiatov May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 25 additions & 21 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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')
Expand All @@ -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')
Expand Down Expand Up @@ -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 = (
Expand All @@ -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')
Expand Down