Skip to content

test: configure the windows test environment #15018

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 1 commit into from
Nov 27, 2018
Merged

test: configure the windows test environment #15018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions test/IRGen/lit.local.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
config.substitutions = list(config.substitutions)

config.substitutions.insert(0, ('%build-irgen-test-overlays',
'%target-swift-frontend -disable-objc-attr-requires-foundation-module -emit-module -o %t -sdk %S/Inputs %S/Inputs/ObjectiveC.swift && '
'%target-swift-frontend -emit-module -o %t -sdk %S/Inputs %S/Inputs/Foundation.swift -I %t'))
'%target-swift-frontend -enable-objc-interop -disable-objc-attr-requires-foundation-module -emit-module -o %t -sdk %S/Inputs %S/Inputs/ObjectiveC.swift && '
'%target-swift-frontend -enable-objc-interop -emit-module -o %t -sdk %S/Inputs %S/Inputs/Foundation.swift -I %t'))
118 changes: 92 additions & 26 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,16 @@ if platform.system() == 'Darwin':
config.environment['TOOLCHAINS'] = \
os.environ.get('TOOLCHAINS', config.darwin_xcrun_toolchain)

# NOTE: this mirrors the kIsWindows from lit.lit.TestRunner in LLVM
kIsWindows = platform.system() == 'Windows'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: please match the naming conventions for all the other variables in the file (snake_case, no leading "k").

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bit more complicated: this is also the name of a variable in the rest of lit (where I stole it from). It is in the core lit infrastructure ... so I'm kinda torn (my personal preference is the snake case).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Uh…we're setting a variable in the rest of lit? Is it expecting us to do that?

Basically, if it's what Clang does then okay (although it may be worth leaving a comment).


# testFormat: The test format to use to interpret tests.
config.test_format = swift_test.SwiftTest(coverage_mode=config.coverage_mode)

# Choose between lit's internal shell pipeline runner and a real shell. If
# LIT_USE_INTERNAL_SHELL is in the environment, we use that as an override.
use_lit_shell = os.environ.get('LIT_USE_INTERNAL_SHELL', not kIsWindows)
config.test_format = swift_test.SwiftTest(coverage_mode=config.coverage_mode,
execute_external=use_lit_shell)

# suffixes: A list of file extensions to treat as test files.
config.suffixes = ['.swift', '.ll', '.sil', '.gyb', '.m', '.swiftinterface',
Expand Down Expand Up @@ -288,6 +296,9 @@ config.PathSanitizingFileCheck = make_path(config.swift_utils, 'PathSanitizingFi
config.swift_lib_dir = make_path(config.swift, '..', '..', 'lib')
config.round_trip_syntax_test = make_path(config.swift_utils, 'round-trip-syntax-test')

config.link = lit.util.which('link', config.environment.get('PATH', '')) or \
lit.util.which('lld-link', config.environment.get('PATH', ''))

# Find the resource directory. Assume it's near the swift compiler if not set.
test_resource_dir = lit_config.params.get('test_resource_dir')
if test_resource_dir:
Expand Down Expand Up @@ -786,6 +797,63 @@ if run_vendor == 'apple':
"-Xlinker -install_name -Xlinker @executable_path/$(basename '\\1')"
% (config.target_build_swift))

elif run_os in ['windows-msvc']:
lit_config.note('Testing Windows ' + config.variant_triple)
config.target_object_format = 'coff'
config.target_dylib_extension = 'dll'
config.target_sdk_name = 'windows'
config.target_runtime = 'native'
config.target_swiftmodule_name = run_cpu + '.swiftmodule'
config.target_swiftdoc_name = run_cpu + '.swiftdoc'

config.target_build_swift = \
('%r -target %s %s %s %s %s %s' % (config.swiftc, \
config.variant_triple, \
resource_dir_opt, mcp_opt, \
config.swift_test_options, \
config.swift_driver_test_options, \
swift_execution_tests_extra_flags))

config.target_run = ''

config.target_swift_frontend = \
('%r -frontend -target %s %s %s %s %s' % (config.swiftc, \
config.variant_triple, \
resource_dir_opt, mcp_opt, \
config.swift_test_options, \
config.swift_frontend_test_options))

config.target_codesign = ''

subst_target_swift_frontend_mock_sdk = config.target_swift_frontend
subst_target_swift_frontend_mock_sdk_after = ''

config.target_build_swift_dylib = \
("%r -parse-as-library -emit-librar -o '\\1'" % (config.target_build_swift))
config.target_clang = \
('clang++ -target %s %s' % (config.variant_triple, clang_mcp_opt))
config.target_ld = \
('%r -libpath:%s' % (config.link, os.path.join(test_resource_dir, \
config.target_sdk_name)))
config.target_sil_opt = \
('%r -target %s %s %s %s' % (config.sil_opt, config.variant_triple, \
resource_dir_opt, mcp_opt, \
config.sil_test_options))
config.target_swift_ide_test = \
('%r -target %s %s %s %s' % (config.swift_ide_test, \
config.variant_triple, \
resource_dir_opt, pcp_opt, ccp_opt))

subst_target_swift_ide_test_mock_sdk = config.target_swift_ide_test
subst_target_swift_ide_test_mock_sdk_after = ''

config.target_swiftc_driver = \
('%r -target %s %s %s' % (config.swiftc, config.variant_triple, \
resource_dir_opt, mcp_opt))
config.target_swift_modulewrap = \
('%r -modulewrap -target %s' % (config.swiftc, config.variant_triple))


elif run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'windows-gnu']:
# Linux/FreeBSD/Cygwin
if run_os == 'windows-cygnus':
Expand Down Expand Up @@ -1167,17 +1235,18 @@ config.substitutions.append(('%target-runtime', config.target_runtime))

config.substitutions.append(('%target-typecheck-verify-swift', config.target_parse_verify_swift))

config.substitutions.append(('%target-swift-emit-silgen\(mock-sdk:([^)]+)\)', '%target-swift-frontend(mock-sdk:\\1) -emit-silgen -verify-syntax-tree -enable-sil-ownership'))
config.substitutions.append(('%target-swift-emit-silgen\(mock-sdk:([^)]+)\)',
SubstituteCaptures(r'%target-swift-frontend(mock-sdk:\1) -emit-silgen -verify-syntax-tree -enable-sil-ownership')))
config.substitutions.append(('%target-swift-emit-silgen', '%target-swift-frontend -emit-silgen -verify-syntax-tree -enable-sil-ownership'))
config.substitutions.append(('%target-swift-emit-sil\(mock-sdk:([^)]+)\)', '%target-swift-frontend(mock-sdk:\\1) -emit-sil -verify-syntax-tree'))
config.substitutions.append(('%target-swift-emit-sil\(mock-sdk:([^)]+)\)',
SubstituteCaptures(r'%target-swift-frontend(mock-sdk:\1) -emit-sil -verify-syntax-tree')))
config.substitutions.append(('%target-swift-emit-sil', '%target-swift-frontend -emit-sil -verify-syntax-tree'))
config.substitutions.append(('%target-swift-emit-ir\(mock-sdk:([^)]+)\)', '%target-swift-frontend(mock-sdk:\\1) -emit-ir -verify-syntax-tree'))
config.substitutions.append(('%target-swift-emit-ir\(mock-sdk:([^)]+)\)',
SubstituteCaptures(r'%target-swift-frontend(mock-sdk:\1) -emit-ir -verify-syntax-tree')))
config.substitutions.append(('%target-swift-emit-ir', '%target-swift-frontend -emit-ir -verify-syntax-tree'))
config.substitutions.append(
('%target-swift-frontend\(mock-sdk:([^)]+)\)',
'%s \\1 %s' %
(subst_target_swift_frontend_mock_sdk,
subst_target_swift_frontend_mock_sdk_after)))
config.substitutions.append(('%target-swift-frontend\(mock-sdk:([^)]+)\)',
SubstituteCaptures(r'%s \1 %s' % (subst_target_swift_frontend_mock_sdk,
subst_target_swift_frontend_mock_sdk_after))))
config.substitutions.append(('%target-swift-frontend', config.target_swift_frontend))


Expand All @@ -1202,27 +1271,25 @@ config.substitutions.append(
r'ln \1 \2 || cp \1 \2'))

config.substitutions.append(('%utils', config.swift_utils))
config.substitutions.append(('%line-directive', config.line_directive))
config.substitutions.append(('%gyb', config.gyb))
config.substitutions.append(('%line-directive', '%r %s' % (sys.executable, config.line_directive)))
config.substitutions.append(('%gyb', '%r %s' % (sys.executable, config.gyb)))
config.substitutions.append(('%round-trip-syntax-test', config.round_trip_syntax_test))
config.substitutions.append(('%rth', config.rth))
config.substitutions.append(('%scale-test',
'{} --swiftc-binary={} --tmpdir=%t'.format(
config.scale_test, config.swiftc)))
config.substitutions.append(
('%empty-directory\(([^)]+)\)', 'rm -rf \"\\1\" && mkdir -p \"\\1\"'))
config.substitutions.append(('%empty-directory\(([^)]+)\)',
SubstituteCaptures(r'rm -rf "\1" && mkdir -p "\1"')))

config.substitutions.append(('%target-sil-opt', config.target_sil_opt))
config.substitutions.append(('%target-sil-func-extractor', config.target_sil_func_extractor))
config.substitutions.append(('%target-sil-llvm-gen', config.target_sil_llvm_gen))
config.substitutions.append(('%target-sil-nm', config.target_sil_nm))

config.substitutions.append(
('%target-swift-ide-test\(mock-sdk:([^)]+)\)',
'%s \\1 %s -swift-version %s' %
(subst_target_swift_ide_test_mock_sdk,
subst_target_swift_ide_test_mock_sdk_after,
swift_version)))
config.substitutions.append(('%target-swift-ide-test\(mock-sdk:([^)]+)\)',
SubstituteCaptures(r'%s \1 %s -swift-version %s' % (subst_target_swift_ide_test_mock_sdk,
subst_target_swift_ide_test_mock_sdk_after,
swift_version))))
config.substitutions.append(('%target-swift-ide-test', "%s -swift-version %s" % (config.target_swift_ide_test, swift_version)))

if not hasattr(config, 'target_swift_reflection_test'):
Expand Down Expand Up @@ -1267,13 +1334,12 @@ config.substitutions.append(('%target-resilience-test', config.target_resilience
config.substitutions.append(('%llvm-profdata', config.llvm_profdata))
config.substitutions.append(('%llvm-cov', config.llvm_cov))

config.substitutions.append(
('%FileCheck',
'%s --sanitize \'BUILD_DIR=%s\' --sanitize \'SOURCE_DIR=%s\' --use-filecheck \'%s\'' %
(config.PathSanitizingFileCheck,
pipes.quote(swift_obj_root),
pipes.quote(config.swift_src_root),
pipes.quote(config.filecheck))))
config.substitutions.append(('%FileCheck',
'%r %r --sanitize BUILD_DIR=%r --sanitize SOURCE_DIR=%r --use-filecheck %r' % (sys.executable,
config.PathSanitizingFileCheck,
swift_obj_root,
config.swift_src_root,
config.filecheck)))
config.substitutions.append(('%raw-FileCheck', pipes.quote(config.filecheck)))

# If static stdlib is present, enable static stdlib tests
Expand Down