File tree Expand file tree Collapse file tree 6 files changed +1
-19
lines changed Expand file tree Collapse file tree 6 files changed +1
-19
lines changed Original file line number Diff line number Diff line change @@ -225,9 +225,6 @@ endif()
225
225
option (SWIFT_BUILD_SOURCEKIT
226
226
"Build SourceKit"
227
227
${SWIFT_BUILD_SOURCEKIT_default} )
228
- option (SWIFT_ENABLE_SOURCEKIT_TESTS
229
- "Enable running SourceKit tests"
230
- ${SWIFT_BUILD_SOURCEKIT_default} )
231
228
232
229
#
233
230
# Include CMake modules
Original file line number Diff line number Diff line change @@ -131,7 +131,6 @@ if(PYTHONINTERP_FOUND)
131
131
normalize_boolean_spelling (SWIFT_STDLIB_ASSERTIONS )
132
132
normalize_boolean_spelling (SWIFT_AST_VERIFIER )
133
133
normalize_boolean_spelling (SWIFT_ASAN_BUILD )
134
- normalize_boolean_spelling (SWIFT_ENABLE_SOURCEKIT_TESTS )
135
134
136
135
# A directory where to put the xUnit-style XML test results.
137
136
set (swift_test_results_dir
Original file line number Diff line number Diff line change 1
- if ' sourcekit ' not in config.available_features:
1
+ if ' OS=macosx ' not in config.available_features:
2
2
config.unsupported = True
3
3
4
4
else:
Original file line number Diff line number Diff line change @@ -42,9 +42,6 @@ if "@SWIFT_OPTIMIZED@" == "TRUE":
42
42
if "@SWIFT_HAVE_WORKING_STD_REGEX@" == "FALSE":
43
43
config.available_features.add('broken_std_regex')
44
44
45
- if "@SWIFT_ENABLE_SOURCEKIT_TESTS@" == "TRUE":
46
- config.available_features.add('sourcekit')
47
-
48
45
# Let the main config do the real work.
49
46
if config.test_exec_root is None:
50
47
config.test_exec_root = os.path.dirname(os.path.realpath(__file__))
Original file line number Diff line number Diff line change @@ -131,7 +131,6 @@ KNOWN_SETTINGS=(
131
131
skip-test-watchos-simulator " " " set to skip testing Swift stdlibs for Apple watchOS simulators (i.e. test devices only)"
132
132
skip-test-validation " " " set to skip validation test suite"
133
133
skip-test-optimized " " " set to skip testing the test suite in optimized mode"
134
- skip-test-sourcekit " " " set to skip testing SourceKit"
135
134
stress-test-sourcekit " " " set to run the stress-SourceKit target"
136
135
xcode-ide-only " " " set to configure Xcode project for IDE use only, not building"
137
136
workspace " ${HOME} /src" " source directory containing llvm, clang, swift"
@@ -1496,13 +1495,6 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_
1496
1495
-DSWIFT_RUNTIME_ENABLE_LEAK_CHECKER:BOOL=$( true_false " ${SWIFT_RUNTIME_ENABLE_LEAK_CHECKER} " )
1497
1496
)
1498
1497
1499
- if [[ " ${SKIP_TEST_SOURCEKIT} " ]] ; then
1500
- swift_cmake_options=(
1501
- " ${swift_cmake_options[@]} "
1502
- -DSWIFT_ENABLE_SOURCEKIT_TESTS:BOOL=FALSE
1503
- )
1504
- fi
1505
-
1506
1498
for product in " ${PRODUCTS[@]} " ; do
1507
1499
unset skip_build
1508
1500
build_dir=$( build_directory $deployment_target $product )
Original file line number Diff line number Diff line change 32
32
if "@SWIFT_OPTIMIZED@" == "TRUE":
33
33
config.available_features.add("optimized_stdlib")
34
34
35
- if "@SWIFT_ENABLE_SOURCEKIT_TESTS@" == "TRUE":
36
- config.available_features.add('sourcekit')
37
-
38
35
# Let the main config do the real work.
39
36
config.test_exec_root = os.path.dirname(os.path.realpath(__file__))
40
37
lit_config.load_config(config, "@SWIFT_SOURCE_DIR@/validation-test/lit.cfg")
You can’t perform that action at this time.
0 commit comments