Skip to content

Commit f4c1f4b

Browse files
committed
Disable SourceKit tests everywhere except OS X
SourceKit tests currently implicitly rely on the OS X standard library.
1 parent 6f8bee1 commit f4c1f4b

File tree

6 files changed

+1
-19
lines changed

6 files changed

+1
-19
lines changed

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,6 @@ endif()
225225
option(SWIFT_BUILD_SOURCEKIT
226226
"Build SourceKit"
227227
${SWIFT_BUILD_SOURCEKIT_default})
228-
option(SWIFT_ENABLE_SOURCEKIT_TESTS
229-
"Enable running SourceKit tests"
230-
${SWIFT_BUILD_SOURCEKIT_default})
231228

232229
#
233230
# Include CMake modules

test/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ if(PYTHONINTERP_FOUND)
131131
normalize_boolean_spelling(SWIFT_STDLIB_ASSERTIONS)
132132
normalize_boolean_spelling(SWIFT_AST_VERIFIER)
133133
normalize_boolean_spelling(SWIFT_ASAN_BUILD)
134-
normalize_boolean_spelling(SWIFT_ENABLE_SOURCEKIT_TESTS)
135134

136135
# A directory where to put the xUnit-style XML test results.
137136
set(swift_test_results_dir

test/SourceKit/lit.local.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if 'sourcekit' not in config.available_features:
1+
if 'OS=macosx' not in config.available_features:
22
config.unsupported = True
33

44
else:

test/lit.site.cfg.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ if "@SWIFT_OPTIMIZED@" == "TRUE":
4242
if "@SWIFT_HAVE_WORKING_STD_REGEX@" == "FALSE":
4343
config.available_features.add('broken_std_regex')
4444

45-
if "@SWIFT_ENABLE_SOURCEKIT_TESTS@" == "TRUE":
46-
config.available_features.add('sourcekit')
47-
4845
# Let the main config do the real work.
4946
if config.test_exec_root is None:
5047
config.test_exec_root = os.path.dirname(os.path.realpath(__file__))

utils/build-script-impl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ KNOWN_SETTINGS=(
131131
skip-test-watchos-simulator "" "set to skip testing Swift stdlibs for Apple watchOS simulators (i.e. test devices only)"
132132
skip-test-validation "" "set to skip validation test suite"
133133
skip-test-optimized "" "set to skip testing the test suite in optimized mode"
134-
skip-test-sourcekit "" "set to skip testing SourceKit"
135134
stress-test-sourcekit "" "set to run the stress-SourceKit target"
136135
xcode-ide-only "" "set to configure Xcode project for IDE use only, not building"
137136
workspace "${HOME}/src" "source directory containing llvm, clang, swift"
@@ -1496,13 +1495,6 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_
14961495
-DSWIFT_RUNTIME_ENABLE_LEAK_CHECKER:BOOL=$(true_false "${SWIFT_RUNTIME_ENABLE_LEAK_CHECKER}")
14971496
)
14981497

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-
15061498
for product in "${PRODUCTS[@]}"; do
15071499
unset skip_build
15081500
build_dir=$(build_directory $deployment_target $product)

validation-test/lit.site.cfg.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ else:
3232
if "@SWIFT_OPTIMIZED@" == "TRUE":
3333
config.available_features.add("optimized_stdlib")
3434

35-
if "@SWIFT_ENABLE_SOURCEKIT_TESTS@" == "TRUE":
36-
config.available_features.add('sourcekit')
37-
3835
# Let the main config do the real work.
3936
config.test_exec_root = os.path.dirname(os.path.realpath(__file__))
4037
lit_config.load_config(config, "@SWIFT_SOURCE_DIR@/validation-test/lit.cfg")

0 commit comments

Comments
 (0)