Merge pull request #40077 from gottesmm/pr-2ea314186d00544a71b7886ab6ef6743b4b560ab

gottesmm · web-flow · commit b02dc65e911e · 2021-11-10T11:02:56.000-08:00
[cmake] Move a bunch of test binaries from install component 'tools' -&gt; 'testsuite-tools'.
diff --git a/tools/lldb-moduleimport-test/CMakeLists.txt b/tools/lldb-moduleimport-test/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_swift_host_tool(lldb-moduleimport-test
   lldb-moduleimport-test.cpp
-  SWIFT_COMPONENT tools
+  SWIFT_COMPONENT testsuite-tools
 )
 target_link_libraries(lldb-moduleimport-test
                       PRIVATE
diff --git a/tools/sil-passpipeline-dumper/CMakeLists.txt b/tools/sil-passpipeline-dumper/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_swift_host_tool(sil-passpipeline-dumper
   SILPassPipelineDumper.cpp
-  SWIFT_COMPONENT tools
+  SWIFT_COMPONENT testsuite-tools
 )
 target_link_libraries(sil-passpipeline-dumper PRIVATE
   swiftFrontend
diff --git a/tools/swift-demangle-yamldump/CMakeLists.txt b/tools/swift-demangle-yamldump/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_swift_host_tool(swift-demangle-yamldump
   swift-demangle-yamldump.cpp
   LLVM_LINK_COMPONENTS support
-  SWIFT_COMPONENT tools
+  SWIFT_COMPONENT testsuite-tools
   )
 target_link_libraries(swift-demangle-yamldump
                       PRIVATE
diff --git a/tools/swift-reflection-fuzzer/CMakeLists.txt b/tools/swift-reflection-fuzzer/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_swift_fuzzer_host_tool(swift-reflection-fuzzer
   swift-reflection-fuzzer.cpp
   LLVM_LINK_COMPONENTS support
-  SWIFT_COMPONENT tools 
+  SWIFT_COMPONENT testsuite-tools
   )
 target_link_libraries(swift-reflection-fuzzer
                       PRIVATE
diff --git a/tools/swift-remoteast-test/CMakeLists.txt b/tools/swift-remoteast-test/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_swift_host_tool(swift-remoteast-test
   swift-remoteast-test.cpp
-  SWIFT_COMPONENT tools
+  SWIFT_COMPONENT testsuite-tools
 )
 target_link_libraries(swift-remoteast-test
                       PRIVATE
diff --git a/tools/swift-syntax-parser-test/CMakeLists.txt b/tools/swift-syntax-parser-test/CMakeLists.txt
@@ -5,7 +5,7 @@ add_swift_host_tool(swift-syntax-parser-test
   swift-syntax-parser-test.cpp
   LLVM_LINK_COMPONENTS
     support
-  SWIFT_COMPONENT tools
+  SWIFT_COMPONENT testsuite-tools
 )
 if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
   set_target_properties(swift-syntax-parser-test PROPERTIES
diff --git a/tools/swift-syntax-test/CMakeLists.txt b/tools/swift-syntax-test/CMakeLists.txt
@@ -2,7 +2,7 @@ add_swift_host_tool(swift-syntax-test
   swift-syntax-test.cpp
   LLVM_LINK_COMPONENTS
     Support
-  SWIFT_COMPONENT tools
+  SWIFT_COMPONENT testsuite-tools
 )
 target_link_libraries(swift-syntax-test
                       PRIVATE
diff --git a/utils/build-windows.bat b/utils/build-windows.bat
@@ -271,7 +271,7 @@ cmake^
     -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=YES^
     -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=YES^
     -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES^
-    -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"^
+    -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"^
     -DSWIFT_PARALLEL_LINK_JOBS=8^
     -DPYTHON_EXECUTABLE:PATH=%PYTHON_HOME%\python.exe^
     -DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`add_swift_host_tool(lldb-moduleimport-test`
`2`	`2`	`lldb-moduleimport-test.cpp`
`3`		`- SWIFT_COMPONENT tools`
	`3`	`+ SWIFT_COMPONENT testsuite-tools`
`4`	`4`	`)`
`5`	`5`	`target_link_libraries(lldb-moduleimport-test`
`6`	`6`	`PRIVATE`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`add_swift_host_tool(sil-passpipeline-dumper`
`2`	`2`	`SILPassPipelineDumper.cpp`
`3`		`- SWIFT_COMPONENT tools`
	`3`	`+ SWIFT_COMPONENT testsuite-tools`
`4`	`4`	`)`
`5`	`5`	`target_link_libraries(sil-passpipeline-dumper PRIVATE`
`6`	`6`	`swiftFrontend`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`add_swift_host_tool(swift-demangle-yamldump`
`2`	`2`	`swift-demangle-yamldump.cpp`
`3`	`3`	`LLVM_LINK_COMPONENTS support`
`4`		`- SWIFT_COMPONENT tools`
	`4`	`+ SWIFT_COMPONENT testsuite-tools`
`5`	`5`	`)`
`6`	`6`	`target_link_libraries(swift-demangle-yamldump`
`7`	`7`	`PRIVATE`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`add_swift_fuzzer_host_tool(swift-reflection-fuzzer`
`2`	`2`	`swift-reflection-fuzzer.cpp`
`3`	`3`	`LLVM_LINK_COMPONENTS support`
`4`		`- SWIFT_COMPONENT tools`
	`4`	`+ SWIFT_COMPONENT testsuite-tools`
`5`	`5`	`)`
`6`	`6`	`target_link_libraries(swift-reflection-fuzzer`
`7`	`7`	`PRIVATE`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`add_swift_host_tool(swift-remoteast-test`
`2`	`2`	`swift-remoteast-test.cpp`
`3`		`- SWIFT_COMPONENT tools`
	`3`	`+ SWIFT_COMPONENT testsuite-tools`
`4`	`4`	`)`
`5`	`5`	`target_link_libraries(swift-remoteast-test`
`6`	`6`	`PRIVATE`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ add_swift_host_tool(swift-syntax-parser-test`
`5`	`5`	`swift-syntax-parser-test.cpp`
`6`	`6`	`LLVM_LINK_COMPONENTS`
`7`	`7`	`support`
`8`		`- SWIFT_COMPONENT tools`
	`8`	`+ SWIFT_COMPONENT testsuite-tools`
`9`	`9`	`)`
`10`	`10`	`if(CMAKE_SYSTEM_NAME STREQUAL Darwin)`
`11`	`11`	`set_target_properties(swift-syntax-parser-test PROPERTIES`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ add_swift_host_tool(swift-syntax-test`
`2`	`2`	`swift-syntax-test.cpp`
`3`	`3`	`LLVM_LINK_COMPONENTS`
`4`	`4`	`Support`
`5`		`- SWIFT_COMPONENT tools`
	`5`	`+ SWIFT_COMPONENT testsuite-tools`
`6`	`6`	`)`
`7`	`7`	`target_link_libraries(swift-syntax-test`
`8`	`8`	`PRIVATE`