Fix build-script SwiftEvolve support (swiftlang#22148)

Author: beccadax

utils/build-script

@@ -882,6 +882,8 @@ class BuildScriptInvocation(object):
             product_classes.append(products.SwiftSyntax)
         if self.args.build_skstresstester:
             product_classes.append(products.SKStressTester)
+        if self.args.build_swiftevolve:
+            product_classes.append(products.SwiftEvolve)
         if self.args.build_indexstoredb:
             product_classes.append(products.IndexStoreDB)
         if self.args.build_sourcekitlsp:

utils/build-script-impl

@@ -1875,6 +1875,7 @@ function set_swiftsyntax_build_command() {
 function set_stresstester_build_script_helper_command() {
     local package_name="$1"
     local package_build_type="$2"
+    local package_build_dir="$3"
 
     if [ "${SKIP_BUILD_SWIFTSYNTAX}" ]; then
         echo "Error: Cannot build $package_name without SwiftSyntax."
@@ -1897,7 +1898,7 @@ function set_stresstester_build_script_helper_command() {
 
     stresstester_build_script_helper_command+=(
         --package-dir="${package_name}"
-        --build-dir="$(build_directory ${host} skstresstester)"
+        --build-dir="${package_build_dir}"
         --swiftc-exec="$(build_directory_bin ${LOCAL_HOST} swift)/swiftc"
         --swift-build-exec="$(swiftpm_find_tool swift-build)"
         --swift-test-exec="$(swiftpm_find_tool swift-test)"
@@ -1909,12 +1910,12 @@ function set_stresstester_build_script_helper_command() {
 }
 
 function set_skstresstester_build_command() {
-    set_stresstester_build_script_helper_command SourceKitStressTester "${SKSTRESSTESTER_BUILD_TYPE}"
+    set_stresstester_build_script_helper_command SourceKitStressTester "${SKSTRESSTESTER_BUILD_TYPE}" "$(build_directory ${host} skstresstester)"
     skstresstester_build_command=("${stresstester_build_script_helper_command[@]}")
 }
 
 function set_swiftevolve_build_command() {
-    set_stresstester_build_script_helper_command SwiftEvolve "${SWIFTEVOLVE_BUILD_TYPE}"
+    set_stresstester_build_script_helper_command SwiftEvolve "${SWIFTEVOLVE_BUILD_TYPE}" "$(build_directory ${host} swiftevolve)"
     swiftevolve_build_command=("${stresstester_build_script_helper_command[@]}")
 }
 
@@ -3229,6 +3230,7 @@ for host in "${ALL_HOSTS[@]}"; do
                     continue
                 fi
                 echo "--- Running tests for ${product} ---"
+                set_swiftevolve_build_command
                 call "${swiftevolve_build_command[@]}" test
                 continue
                 ;;
@@ -3620,6 +3622,7 @@ for host in "${ALL_HOSTS[@]}"; do
                 fi
 
                 echo "--- Installing ${product} ---"
+                set_swiftevolve_build_command
                 call "${swiftevolve_build_command[@]}" --prefix="${host_install_destdir}${host_install_prefix}" install
                 continue
                 ;;

utils/swift_build_support/swift_build_support/products/__init__.py

@@ -23,6 +23,7 @@
 from .skstresstester import SKStressTester
 from .sourcekitlsp import SourceKitLSP
 from .swift import Swift
+from .swiftevolve import SwiftEvolve
 from .swiftpm import SwiftPM
 from .swiftsyntax import SwiftSyntax
 from .xctest import XCTest
@@ -43,6 +44,7 @@
     'XCTest',
     'SwiftSyntax',
     'SKStressTester',
+    'SwiftEvolve',
     'IndexStoreDB',
     'SourceKitLSP',
 ]

utils/swift_build_support/swift_build_support/products/swiftevolve.py

@@ -0,0 +1,23 @@
+# swift_build_support/products/skstresstester.py -----------------*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# ----------------------------------------------------------------------------
+
+from . import product
+
+
+class SwiftEvolve(product.Product):
+    @classmethod
+    def product_source_name(cls):
+        """product_source_name() -> str
+
+        The name of the source code directory of this product.
+        """
+        return "swift-stress-tester"