Skip to content

Commit c9cc58c

Browse files
update build-script python tests
1 parent 2dc3995 commit c9cc58c

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

utils/build_swift/tests/expected_options.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,8 @@
274274
'swift_tools_max_parallel_lto_link_jobs':
275275
defaults.SWIFT_MAX_PARALLEL_LTO_LINK_JOBS,
276276
'swift_user_visible_version': defaults.SWIFT_USER_VISIBLE_VERSION,
277+
'build_stdlib_docs': False,
278+
'preview_stdlib_docs': False,
277279
'symbols_package': None,
278280
'clean_libdispatch': True,
279281
'clean_foundation': True,
@@ -578,6 +580,8 @@ class BuildScriptImplOption(_BaseOption):
578580
SetTrueOption('--build-minimal-stdlib', dest='build_minimalstdlib'),
579581
SetTrueOption('--build-wasm-stdlib', dest='build_wasmstdlib'),
580582
SetTrueOption('--wasmkit', dest='build_wasmkit'),
583+
SetTrueOption('--build-stdlib-docs'),
584+
SetTrueOption('--preview-stdlib-docs'),
581585
SetTrueOption('-B', dest='benchmark'),
582586
SetTrueOption('-S', dest='skip_build'),
583587
SetTrueOption('-b', dest='build_llbuild'),

utils/swift_build_support/swift_build_support/products/swift.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ def _enable_embedded_stdlib_cross_compiling(self):
275275

276276
@property
277277
def _enable_stdlib_symbol_graphs(self):
278-
return [('SWIFT_STDLIB_BUILD_SYMBOL_GRAPHS',
278+
return [('SWIFT_STDLIB_BUILD_SYMBOL_GRAPHS:BOOL',
279279
self.args.build_stdlib_docs)]
280280

281281
def _handle_swift_debuginfo_non_lto_args(self):

utils/swift_build_support/tests/products/test_swift.py

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ def setUp(self):
7171
build_embedded_stdlib_cross_compiling=False,
7272
swift_freestanding_is_darwin=False,
7373
build_swift_private_stdlib=True,
74-
swift_tools_ld64_lto_codegen_only_for_supporting_targets=False)
74+
swift_tools_ld64_lto_codegen_only_for_supporting_targets=False,
75+
build_stdlib_docs=False)
7576

7677
# Setup shell
7778
shell.dry_run = True
@@ -120,7 +121,8 @@ def test_by_default_no_cmake_options(self):
120121
'-DSWIFT_SHOULD_BUILD_EMBEDDED_STDLIB=TRUE',
121122
'-DSWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING=FALSE',
122123
'-DSWIFT_TOOLS_LD64_LTO_CODEGEN_ONLY_FOR_SUPPORTING_TARGETS:BOOL=FALSE',
123-
'-USWIFT_DEBUGINFO_NON_LTO_ARGS'
124+
'-USWIFT_DEBUGINFO_NON_LTO_ARGS',
125+
'-DSWIFT_STDLIB_BUILD_SYMBOL_GRAPHS:BOOL=FALSE'
124126
]
125127
self.assertEqual(set(swift.cmake_options), set(expected))
126128

@@ -154,7 +156,8 @@ def test_swift_runtime_tsan(self):
154156
'-DSWIFT_SHOULD_BUILD_EMBEDDED_STDLIB=TRUE',
155157
'-DSWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING=FALSE',
156158
'-DSWIFT_TOOLS_LD64_LTO_CODEGEN_ONLY_FOR_SUPPORTING_TARGETS:BOOL=FALSE',
157-
'-USWIFT_DEBUGINFO_NON_LTO_ARGS'
159+
'-USWIFT_DEBUGINFO_NON_LTO_ARGS',
160+
'-DSWIFT_STDLIB_BUILD_SYMBOL_GRAPHS:BOOL=FALSE'
158161
]
159162
self.assertEqual(set(swift.cmake_options), set(flags_set))
160163

@@ -567,3 +570,16 @@ def test_swift_debuginfo_non_lto_args(self):
567570
'-gline-tables-only;-v'],
568571
[x for x in swift.cmake_options
569572
if 'SWIFT_DEBUGINFO_NON_LTO_ARGS' in x])
573+
574+
def test_stdlib_docs_flags(self):
575+
self.args.build_stdlib_docs = True
576+
swift = Swift(
577+
args=self.args,
578+
toolchain=self.toolchain,
579+
source_dir='/path/to/src',
580+
build_dir='/path/to/build')
581+
self.assertEqual(
582+
['-DSWIFT_STDLIB_BUILD_SYMBOL_GRAPHS:BOOL='
583+
'TRUE'],
584+
[x for x in swift.cmake_options
585+
if 'DSWIFT_STDLIB_BUILD_SYMBOL_GRAPHS' in x])

0 commit comments

Comments
 (0)