Skip to content

Commit b75645d

Browse files
Merge pull request swiftlang#34723 from buttaface/tests
[build] Don't build test targets in tools/ if SWIFT_INCLUDE_TESTS is turned off
2 parents 1c3ea86 + 86c4057 commit b75645d

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

tools/CMakeLists.txt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,30 @@ endif()
1616
add_swift_tool_subdirectory(driver)
1717
add_swift_tool_subdirectory(sil-opt)
1818
add_swift_tool_subdirectory(swift-dependency-tool)
19-
add_swift_tool_subdirectory(swift-ide-test)
20-
add_swift_tool_subdirectory(swift-remoteast-test)
2119
add_swift_tool_subdirectory(swift-demangle)
2220
add_swift_tool_subdirectory(swift-demangle-yamldump)
2321
add_swift_tool_subdirectory(swift-def-to-yaml-converter)
2422
add_swift_tool_subdirectory(swift-serialize-diagnostics)
25-
add_swift_tool_subdirectory(lldb-moduleimport-test)
2623
add_swift_tool_subdirectory(sil-func-extractor)
2724
add_swift_tool_subdirectory(sil-llvm-gen)
2825
add_swift_tool_subdirectory(sil-nm)
2926
add_swift_tool_subdirectory(sil-passpipeline-dumper)
3027
add_swift_tool_subdirectory(swift-llvm-opt)
3128
add_swift_tool_subdirectory(swift-api-digester)
3229
add_swift_tool_subdirectory(swift-ast-script)
33-
add_swift_tool_subdirectory(swift-syntax-test)
3430
add_swift_tool_subdirectory(swift-refactor)
3531
if(SWIFT_BUILD_SYNTAXPARSERLIB)
3632
add_swift_tool_subdirectory(libSwiftSyntaxParser)
37-
add_swift_tool_subdirectory(swift-syntax-parser-test)
33+
if(SWIFT_INCLUDE_TESTS)
34+
add_swift_tool_subdirectory(swift-syntax-parser-test)
35+
endif()
36+
endif()
37+
38+
if(SWIFT_INCLUDE_TESTS)
39+
add_swift_tool_subdirectory(swift-ide-test)
40+
add_swift_tool_subdirectory(swift-remoteast-test)
41+
add_swift_tool_subdirectory(lldb-moduleimport-test)
42+
add_swift_tool_subdirectory(swift-syntax-test)
3843
endif()
3944

4045
if(LLVM_USE_SANITIZE_COVERAGE)

tools/SourceKit/tools/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ include_directories(
55
)
66

77
add_swift_lib_subdirectory(sourcekitd)
8-
add_swift_tool_subdirectory(sourcekitd-test)
98
if(LibEdit_FOUND AND LibEdit_HAS_UNICODE)
109
add_swift_tool_subdirectory(sourcekitd-repl)
1110
endif()
12-
add_swift_tool_subdirectory(complete-test)
11+
if(SWIFT_INCLUDE_TESTS)
12+
add_swift_tool_subdirectory(sourcekitd-test)
13+
add_swift_tool_subdirectory(complete-test)
14+
endif()

0 commit comments

Comments
 (0)