Skip to content

Commit 06cb5c0

Browse files
committed
[cmake] Move a bunch of test binaries from install component 'tools' -> 'testsuite-tools'.
All of these are tools that are only meant to be used when testing swift. Thus it doesn't make sense to include them in the catch all 'tools' install component that distributions use to build all the tools. I verified that all of the mac/linux presets in tree that have tools also has testsuite-tools so this should be NFC. On Windows, I needed to add testsuite-tools to build-windows.bat so should be NFC there as well.
1 parent 9512927 commit 06cb5c0

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

tools/lldb-moduleimport-test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
add_swift_host_tool(lldb-moduleimport-test
22
lldb-moduleimport-test.cpp
3-
SWIFT_COMPONENT tools
3+
SWIFT_COMPONENT testsuite-tools
44
)
55
target_link_libraries(lldb-moduleimport-test
66
PRIVATE

tools/sil-passpipeline-dumper/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
add_swift_host_tool(sil-passpipeline-dumper
22
SILPassPipelineDumper.cpp
3-
SWIFT_COMPONENT tools
3+
SWIFT_COMPONENT testsuite-tools
44
)
55
target_link_libraries(sil-passpipeline-dumper PRIVATE
66
swiftFrontend

tools/swift-demangle-yamldump/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
add_swift_host_tool(swift-demangle-yamldump
22
swift-demangle-yamldump.cpp
33
LLVM_LINK_COMPONENTS support
4-
SWIFT_COMPONENT tools
4+
SWIFT_COMPONENT testsuite-tools
55
)
66
target_link_libraries(swift-demangle-yamldump
77
PRIVATE

tools/swift-reflection-fuzzer/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
add_swift_fuzzer_host_tool(swift-reflection-fuzzer
22
swift-reflection-fuzzer.cpp
33
LLVM_LINK_COMPONENTS support
4-
SWIFT_COMPONENT tools
4+
SWIFT_COMPONENT testsuite-tools
55
)
66
target_link_libraries(swift-reflection-fuzzer
77
PRIVATE

tools/swift-remoteast-test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
add_swift_host_tool(swift-remoteast-test
22
swift-remoteast-test.cpp
3-
SWIFT_COMPONENT tools
3+
SWIFT_COMPONENT testsuite-tools
44
)
55
target_link_libraries(swift-remoteast-test
66
PRIVATE

tools/swift-syntax-parser-test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ add_swift_host_tool(swift-syntax-parser-test
55
swift-syntax-parser-test.cpp
66
LLVM_LINK_COMPONENTS
77
support
8-
SWIFT_COMPONENT tools
8+
SWIFT_COMPONENT testsuite-tools
99
)
1010
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
1111
set_target_properties(swift-syntax-parser-test PROPERTIES

tools/swift-syntax-test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ add_swift_host_tool(swift-syntax-test
22
swift-syntax-test.cpp
33
LLVM_LINK_COMPONENTS
44
Support
5-
SWIFT_COMPONENT tools
5+
SWIFT_COMPONENT testsuite-tools
66
)
77
target_link_libraries(swift-syntax-test
88
PRIVATE

utils/build-windows.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ cmake^
271271
-DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=YES^
272272
-DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=YES^
273273
-DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES^
274-
-DSWIFT_INSTALL_COMPONENTS="autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;editor-integration;tools;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers"^
274+
-DSWIFT_INSTALL_COMPONENTS="autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;editor-integration;tools;testsuite-tools;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers"^
275275
-DSWIFT_PARALLEL_LINK_JOBS=8^
276276
-DPYTHON_EXECUTABLE:PATH=%PYTHON_HOME%\python.exe^
277277
-DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^

0 commit comments

Comments
 (0)