[build-script] Only build XCTest once #1506
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
modocache
force-pushed
the
build-script-xctest-fixmes
branch
from
8fa7f8c to
0979b61
Compare
|
@swift-ci Please test |
| echo "--- Installing ${product} ---" | ||
| XCTEST_BUILD_DIR=$(build_directory ${deployment_target} xctest) | ||
| XCTEST_INSTALL_PREFIX="${INSTALL_DESTDIR}"/"${INSTALL_PREFIX}"/lib/swift/"${LIB_TARGET}" |
There was a problem hiding this comment.
Can't we use just one pair of quotes here, from start to end of the path?
|
LGTM, let's see what CI says. |
modocache
force-pushed
the
build-script-xctest-fixmes
branch
from
0979b61 to
162812b
Compare
|
@gribozavr Great! I also addressed your comment. |
Prior to swiftlang/swift-corelibs-xctest#57 and swiftlang/swift-corelibs-xctest#58, the swift-corelibs-xctest build script did not provide a way an already built XCTest.so to be tested or installed. As a result, the Swift build script would build XCTest several times. For example, the following invocation would build XCTest three separate times: ``` $ utils/build-script --xctest --test -- --install-xctest ``` Modifications to the XCTest build script now allow a prebuilt XCTest to be tested (via the `build_script.py test` subcommmand) and installed (via the `build_script.py install` subcommand). Use these in the Swift build script to build XCTest only once, then test and install the built version. Also, explicitly disable XCTest installation on OS X. XCTest's `build_script.py` only supports non-Darwin platforms, so running `utils/build-script --xctest -- --install-xctest` on OS X used to cause the build script to fail because of how that script invokes `swiftc`. It now fails with an explicit error indicating `--install-xctest` is unsupported.
modocache
force-pushed
the
build-script-xctest-fixmes
branch
from
162812b to
729e54f
Compare
|
@swift-ci Please test |
|
The failure on Linux is unrelated, but it prevented the XCTest tests from running. XCTest tests on OS X have not yet been enabled on CI, I think @shahmishal is working on it (as evidenced here). Let's try running them again soon, when master is greener? 😇 |
|
@swift-ci Please test |
|
@gribozavr Looks like CI passed, although the OS X tests don't actually test XCTest. Personally I think that's fine--we'll use the preset from #1533 to test XCTest on OS X from now on. Shall I merge? |
gribozavr
added a commit
that referenced
this pull request
Mar 5, 2016
[build-script] Only build XCTest once
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's in this pull request?
Prior to swiftlang/swift-corelibs-xctest#57 and swiftlang/swift-corelibs-xctest#58, the swift-corelibs-xctest build script did not provide a way for an already built XCTest.so to be tested or installed. As a result, the Swift build script would build XCTest several times.
For example, the following invocation would build XCTest three separate times:
Modifications to the XCTest build script now allow a prebuilt XCTest to be tested (via the
build_script.py testsubcommmand) and installed (via thebuild_script.py installsubcommand). Use these in the Swift build script to build XCTest only once, then test and install the built version.This pull request also:
build_script.pyonly supports non-Darwin platforms, so runningutils/build-script --xctest -- --install-xcteston OS X used to cause the build script to fail because of how that script invokesswiftc. It now fails with an explicit error indicating--install-xctestis unsupported.--install-destdir, as--install-swiftpmdoes.Resolved bug number: None
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
Validation Testing
Note: Only members of the Apple organization can trigger swift-ci.