Skip to content

[build-script] Use the correct build directory when building Darwin XCTest #2137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2016
Merged

[build-script] Use the correct build directory when building Darwin XCTest #2137

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1953,16 +1953,14 @@ for deployment_target in "${HOST_TARGET}" "${CROSS_TOOLS_DEPLOYMENT_TARGETS[@]}"
# result, we must copy swift-stdlib-tool ourselves.
copy_swift_stdlib_tool_substitute "$(build_directory_bin ${deployment_target} swift)/swift-stdlib-tool"

# The Linux build places build products in the
# XCTEST_BUILD_DIR. This, and installation of XCTest in
# general, is not supported on OS X.
set -x
xcodebuild \
-workspace "${XCTEST_SOURCE_DIR}"/XCTest.xcworkspace \
-scheme SwiftXCTest \
SWIFT_EXEC="${SWIFTC_BIN}" \
SWIFT_LINK_OBJC_RUNTIME=YES \
DSTROOT="${XCTEST_BUILD_DIR}"
SYMROOT="${XCTEST_BUILD_DIR}" \
OBJROOT="${XCTEST_BUILD_DIR}"
{ set +x; } 2>/dev/null
else
FOUNDATION_BUILD_DIR=$(build_directory ${deployment_target} foundation)
Expand Down Expand Up @@ -2252,7 +2250,9 @@ for deployment_target in "${STDLIB_DEPLOYMENT_TARGETS[@]}"; do
-workspace "${XCTEST_SOURCE_DIR}"/XCTest.xcworkspace \
-scheme SwiftXCTestFunctionalTests \
SWIFT_EXEC="${SWIFTC_BIN}" \
SWIFT_LINK_OBJC_RUNTIME=YES
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)
Expand Down