Merge pull request #2259 from briancroom/use-xctest-build-script

Author: swift-ci

utils/build-script-impl

@@ -1934,35 +1934,25 @@ for deployment_target in "${HOST_TARGET}" "${CROSS_TOOLS_DEPLOYMENT_TARGETS[@]}"
             xctest)
                 SWIFTC_BIN="$(build_directory_bin ${deployment_target} swift)/swiftc"
                 XCTEST_BUILD_DIR=$(build_directory ${deployment_target} xctest)
+                FOUNDATION_BUILD_DIR=$(build_directory ${deployment_target} foundation)
                 if [[ "$(uname -s)" == "Darwin" ]] ; then
                     # xcodebuild requires swift-stdlib-tool to build a Swift
                     # framework. This is normally present when building XCTest
                     # via a packaged .xctoolchain, but here we are using the
                     # swiftc that was just built--no toolchain exists yet. As a
                     # result, we must copy swift-stdlib-tool ourselves.
                     copy_swift_stdlib_tool_substitute "$(build_directory_bin ${deployment_target} swift)/swift-stdlib-tool"
-
-                    set -x
-                    xcodebuild \
-                        -workspace "${XCTEST_SOURCE_DIR}"/XCTest.xcworkspace \
-                        -scheme SwiftXCTest \
-                        SWIFT_EXEC="${SWIFTC_BIN}" \
-                        SWIFT_LINK_OBJC_RUNTIME=YES \
-                        SYMROOT="${XCTEST_BUILD_DIR}" \
-                        OBJROOT="${XCTEST_BUILD_DIR}"
-                    { set +x; } 2>/dev/null
-                else
-                    FOUNDATION_BUILD_DIR=$(build_directory ${deployment_target} foundation)
-                    set -x
-                    # FIXME: Use XCTEST_BUILD_TYPE (which is never properly
-                    #        set) to build either --debug or --release.
-                    "${XCTEST_SOURCE_DIR}"/build_script.py \
-                        --swiftc="${SWIFTC_BIN}" \
-                        --build-dir="${XCTEST_BUILD_DIR}" \
-                        --foundation-build-dir="${FOUNDATION_BUILD_DIR}/Foundation"
-                    { set +x; } 2>/dev/null
                 fi
 
+                set -x
+                # FIXME: Use XCTEST_BUILD_TYPE (which is never properly
+                #        set) to build either --debug or --release.
+                "${XCTEST_SOURCE_DIR}"/build_script.py \
+                    --swiftc="${SWIFTC_BIN}" \
+                    --build-dir="${XCTEST_BUILD_DIR}" \
+                    --foundation-build-dir="${FOUNDATION_BUILD_DIR}/Foundation"
+                { set +x; } 2>/dev/null
+
                 # XCTest builds itself and doesn't rely on cmake
                 continue
                 ;;
@@ -2243,26 +2233,14 @@ for deployment_target in "${STDLIB_DEPLOYMENT_TARGETS[@]}"; do
                 fi
                 echo "--- Running tests for ${product} ---"
                 SWIFTC_BIN="$(build_directory_bin ${deployment_target} swift)/swiftc"
-                if [[ "$(uname -s)" == "Darwin" ]] ; then
-                    set -x
-                    xcodebuild \
-                        -workspace "${XCTEST_SOURCE_DIR}"/XCTest.xcworkspace \
-                        -scheme SwiftXCTestFunctionalTests \
-                        SWIFT_EXEC="${SWIFTC_BIN}" \
-                        SWIFT_LINK_OBJC_RUNTIME=YES \
-                        SYMROOT="${XCTEST_BUILD_DIR}" \
-                        OBJROOT="${XCTEST_BUILD_DIR}"
-                    { set +x; } 2>/dev/null
-                else
-                    FOUNDATION_BUILD_DIR=$(build_directory ${deployment_target} foundation)
-                    XCTEST_BUILD_DIR=$(build_directory ${deployment_target} xctest)
-                    set -x
-                    "${XCTEST_SOURCE_DIR}"/build_script.py test \
-                        --swiftc="${SWIFTC_BIN}" \
-                        --foundation-build-dir="${FOUNDATION_BUILD_DIR}/Foundation" \
-                        "${XCTEST_BUILD_DIR}"
-                    { set +x; } 2>/dev/null
-                fi
+                FOUNDATION_BUILD_DIR=$(build_directory ${deployment_target} foundation)
+                XCTEST_BUILD_DIR=$(build_directory ${deployment_target} xctest)
+                set -x
+                "${XCTEST_SOURCE_DIR}"/build_script.py test \
+                    --swiftc="${SWIFTC_BIN}" \
+                    --foundation-build-dir="${FOUNDATION_BUILD_DIR}/Foundation" \
+                    "${XCTEST_BUILD_DIR}"
+                { set +x; } 2>/dev/null
                 echo "--- Finished tests for ${product} ---"
                 continue
                 ;;