Skip to content

Commit 1218df3

Browse files
committed
Wire --llvm-include-tests in build-script
This was apparently missing in the migration of the llvm product from build-script-impl to build-script,
1 parent 218799a commit 1218df3

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

utils/build-script-impl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ KNOWN_SETTINGS=(
175175
skip-clean-xctest "0" "skip cleaning the xctest build"
176176

177177
## Test Options
178-
llvm-include-tests "1" "Set to true to generate testing targets for LLVM. Set to true by default."
179178
long-test "0" "set to run the long test suite"
180179
only-executable-test "" "only run the executable variant of the swift lit tests"
181180
stress-test "0" "set to run the stress test suite"

utils/build_swift/build_swift/driver_arguments.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,8 +1421,14 @@ def create_argument_parser():
14211421
'Can be called multiple times '
14221422
'to add multiple such options.')
14231423

1424-
option('--no-llvm-include-tests', toggle_false('llvm_include_tests'),
1425-
help='do not generate testing targets for LLVM')
1424+
with mutually_exclusive_group():
1425+
set_defaults(llvm_include_tests=True)
1426+
1427+
option('--no-llvm-include-tests', toggle_false('llvm_include_tests'),
1428+
help='do not generate testing targets for LLVM')
1429+
1430+
option('--llvm-include-tests', toggle_true('llvm_include_tests'),
1431+
help='generate testing targets for LLVM')
14261432

14271433
option('--llvm-cmake-options', append,
14281434
type=argparse.ShellSplitType(),

utils/build_swift/tests/expected_options.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,8 @@ class BuildScriptImplOption(_BaseOption):
557557
SetOption('--no-swift-stdlib-strict-availability',
558558
dest='swift_stdlib_strict_availability', value=False),
559559

560-
SetFalseOption('--no-llvm-include-tests', dest='llvm_include_tests'),
560+
DisableOption('--no-llvm-include-tests', dest='llvm_include_tests'),
561+
EnableOption('--llvm-include-tests', dest='llvm_include_tests'),
561562

562563
SetTrueOption('--install-back-deploy-concurrency',
563564
dest='install_backdeployconcurrency'),

0 commit comments

Comments
 (0)