[cmake] Allow for users to build binaries for testing even if we aren't going to run the actual tests.

Previously, we used SWIFT_INCLUDE_TESTS to control if we created build rules for
binaries just used to test as well as running the tests as well. In this commit,
I changed this behavior by adding an option called SWIFT_INCLUDE_TEST_BINARIES.
This will allow for the stage 1 swift build to build and install test binaries
into the just built toolchain for use by the stage 2 swift that builds the
stdlib.

Author: gottesmm

CMakeLists.txt

@@ -127,6 +127,10 @@ option(SWIFT_BUILD_PERF_TESTSUITE
 
 option(SWIFT_INCLUDE_TESTS "Create targets for building/running tests." TRUE)
 
+option(SWIFT_INCLUDE_TEST_BINARIES
+  "Create targets for building/running test binaries even if SWIFT_INCLUDE_TESTS is disabled"
+  TRUE)
+
 option(SWIFT_INCLUDE_DOCS
     "Create targets for building docs."
     TRUE)

stdlib/tools/CMakeLists.txt

@@ -1,5 +1,5 @@
 # Keep in sync with test/CMakeLists.txt: swift-reflection-test is
 # only used when testing dynamic stdlib.
-if(SWIFT_BUILD_DYNAMIC_STDLIB AND SWIFT_INCLUDE_TESTS)
+if(SWIFT_BUILD_DYNAMIC_STDLIB AND (SWIFT_INCLUDE_TESTS OR SWIFT_INCLUDE_TEST_BINARIES))
   add_subdirectory(swift-reflection-test)
 endif()

tools/CMakeLists.txt

@@ -30,12 +30,12 @@ add_swift_tool_subdirectory(swift-refactor)
 add_swift_tool_subdirectory(libSwiftScan)
 if(SWIFT_BUILD_SYNTAXPARSERLIB)
   add_swift_tool_subdirectory(libSwiftSyntaxParser)
-  if(SWIFT_INCLUDE_TESTS OR SWIFT_BUILD_SYNTAXPARSERTEST)
+  if(SWIFT_INCLUDE_TESTS OR SWIFT_BUILD_SYNTAXPARSERTEST OR SWIFT_INCLUDE_TEST_BINARIES)
     add_swift_tool_subdirectory(swift-syntax-parser-test)
   endif()
 endif()
 
-if(SWIFT_INCLUDE_TESTS)
+if(SWIFT_INCLUDE_TESTS OR SWIFT_INCLUDE_TEST_BINARIES)
   add_swift_tool_subdirectory(swift-ide-test)
   add_swift_tool_subdirectory(swift-remoteast-test)
   add_swift_tool_subdirectory(lldb-moduleimport-test)

tools/SourceKit/tools/CMakeLists.txt

@@ -8,7 +8,7 @@ add_swift_lib_subdirectory(sourcekitd)
 if(LibEdit_FOUND AND LibEdit_HAS_UNICODE)
   add_swift_tool_subdirectory(sourcekitd-repl)
 endif()
-if(SWIFT_INCLUDE_TESTS)
+if(SWIFT_INCLUDE_TESTS OR SWIFT_INCLUDE_TEST_BINARIES)
   add_swift_tool_subdirectory(sourcekitd-test)
   add_swift_tool_subdirectory(complete-test)
 endif()