Skip to content

Commit bca0802

Browse files
committed
[build-script] Rename source-tree-includes-tests to swift-include-tests.
This matches cmake more closely and also matches the build-script-impl argument for including llvm tests ("llvm-include-tests").
1 parent a457a22 commit bca0802

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

utils/build-presets.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ build-swift-static-stdlib=0
927927
build-swift-dynamic-stdlib=0
928928
build-swift-static-sdk-overlay=0
929929
build-swift-dynamic-sdk-overlay=0
930-
source-tree-includes-tests=0
930+
swift-include-tests=0
931931

932932
[preset: remote_mirror_ios_customization]
933933

utils/build-script-impl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ KNOWN_SETTINGS=(
161161
build-sil-debugging-stdlib "0" "set to 1 to build the Swift standard library with -gsil to enable debugging and profiling on SIL level"
162162
check-incremental-compilation "0" "set to 1 to compile swift libraries multiple times to check if incremental compilation works"
163163
llvm-include-tests "1" "Set to true to generate testing targets for LLVM. Set to true by default."
164-
source-tree-includes-tests "1" "set to 0 to allow the build to proceed when 'test' directory is missing (required for B&I builds)"
164+
swift-include-tests "1" "Set to true to generate testing targets for Swift. This allows the build to proceed when 'test' directory is missing (required for B&I builds)"
165165
native-llvm-tools-path "" "directory that contains LLVM tools that are executable on the build machine"
166166
native-clang-tools-path "" "directory that contains Clang tools that are executable on the build machine"
167167
native-swift-tools-path "" "directory that contains Swift tools that are executable on the build machine"
@@ -1954,7 +1954,7 @@ for host in "${ALL_HOSTS[@]}"; do
19541954
native_swift_tools_path="$(build_directory "${LOCAL_HOST}" swift)/bin"
19551955
else
19561956
build_perf_testsuite_this_time=$(true_false "$(not ${SKIP_BUILD_BENCHMARKS})")
1957-
build_tests_this_time=${SOURCE_TREE_INCLUDES_TESTS}
1957+
build_tests_this_time=${SWIFT_INCLUDE_TESTS}
19581958
fi
19591959

19601960
# Command-line parameters override any autodetection that we

0 commit comments

Comments
 (0)