Use workspace.default-members to specify default crates for cargo build #19476
Conversation
This file contains 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
|
@bors-servo r+ |
|
📌 Commit 246475c has been approved by |
highfive
added
the
S-awaiting-merge
SimonSapin
force-pushed
the
default-members
branch
from
246475c
to
55ddf45
Compare
highfive
added
S-awaiting-review
|
@bors-servo r+ |
|
📌 Commit 55ddf45 has been approved by |
highfive
added
S-awaiting-merge
|
@bors-servo: treeclosed=9000 |
|
☔ The latest upstream changes (presumably #19457) made this pull request unmergeable. Please resolve the merge conflicts. |
highfive
added
S-needs-rebase
SimonSapin
force-pushed
the
default-members
branch
from
55ddf45
to
4f29093
Compare
|
Rebased without conflict. (Maybe GitHub uses a different automatic conflict resolution algorithm than my git client?) @bors-servo r=nox |
|
📌 Commit 4f29093 has been approved by |
highfive
added
S-awaiting-merge
bors-servo
pushed a commit
that referenced
this pull request
Dec 5, 2017
Use workspace.default-members to specify default crates for cargo build … and 'cargo test', etc. Include Servo and its unit tests, but not Stylo because that would try to compile the style crate with incompatible feature flags: rust-lang/cargo#4463 `workspace.default-members` was added in rust-lang/cargo#4743. Older Cargo versions ignore it. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19476) <!-- Reviewable:end -->
|
💔 Test failed - linux-rel-wpt |
highfive
added
S-tests-failed
|
@bors-servo: retry
|
|
That means the rustc process terminated with a non-zero (unsuccessful) exit code. However there is no error message from rustc. Maybe rustc segfaulted? I can’t reproduce though :/ Let’s see if it happens reliably. @bors-servo retry (Note that this PR includes a compiler upgrade.) |
bors-servo
pushed a commit
that referenced
this pull request
Dec 7, 2017
Use workspace.default-members to specify default crates for cargo build … and 'cargo test', etc. Include Servo and its unit tests, but not Stylo because that would try to compile the style crate with incompatible feature flags: rust-lang/cargo#4463 `workspace.default-members` was added in rust-lang/cargo#4743. Older Cargo versions ignore it. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19476) <!-- Reviewable:end -->
|
💔 Test failed - mac-rel-wpt3 |
highfive
added
S-tests-failed
I also get this when running |
This will allow writing `tests/unit/*` in the root `Cargo.toml` file to designate Servo unit tests.
(if not usefully)
…ild' … and 'cargo test', etc. Include Servo and its unit tests, but not Stylo because that would try to compile the style crate with incompatible feature flags: rust-lang/cargo#4463 `workspace.default-members` was added in rust-lang/cargo#4743. Older Cargo versions ignore it.
SimonSapin
force-pushed
the
default-members
branch
from
99c3df7
to
1f2b66e
Compare
highfive
added
S-awaiting-review
|
Added: --- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -254,6 +254,9 @@ class MachCommands(CommandBase):
env = self.build_env()
env["RUST_BACKTRACE"] = "1"
+ # Work around https://github.com/rust-lang/cargo/issues/4790
+ del env["RUSTDOCFLAGS"]
+
if "msvc" in host_triple():
# on MSVC, we need some DLLs in the path. They were copied
# in to the servo.exe build dir, so just point PATH to that.Maybe the "server timed out" was flaky network? @bors-servo r=nox |
|
📌 Commit 1f2b66e has been approved by |
highfive
added
S-awaiting-merge
bors-servo
pushed a commit
that referenced
this pull request
Dec 7, 2017
Use workspace.default-members to specify default crates for cargo build … and 'cargo test', etc. Include Servo and its unit tests, but not Stylo because that would try to compile the style crate with incompatible feature flags: rust-lang/cargo#4463 `workspace.default-members` was added in rust-lang/cargo#4743. Older Cargo versions ignore it. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19476) <!-- Reviewable:end -->
|
☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev |
highfive
removed
the
S-awaiting-merge
emilio
added a commit
to emilio/servo
that referenced
this pull request
Dec 9, 2017
bors-servo
pushed a commit
that referenced
this pull request
Dec 9, 2017
mach: Fix cargo-geckolib check / cargo-geckolib build after #19476. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19539) <!-- Reviewable:end -->
emilio
added a commit
to emilio/servo
that referenced
this pull request
Dec 10, 2017
emilio
added a commit
to emilio/servo
that referenced
this pull request
Dec 10, 2017
bors-servo
pushed a commit
that referenced
this pull request
Dec 13, 2017
mach: Fix cargo-geckolib check / cargo-geckolib build after #19476. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19539) <!-- Reviewable:end -->
bors-servo
pushed a commit
that referenced
this pull request
Dec 13, 2017
mach: Fix cargo-geckolib check / cargo-geckolib build after #19476. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19539) <!-- Reviewable:end -->
bors-servo
pushed a commit
that referenced
this pull request
Dec 14, 2017
mach: Fix cargo-geckolib check / cargo-geckolib build after #19476. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19539) <!-- Reviewable:end -->
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.
… and 'cargo test', etc. Include Servo and its unit tests, but not Stylo because that would try to compile the style crate with incompatible feature flags: rust-lang/cargo#4463
workspace.default-memberswas added in rust-lang/cargo#4743. Older Cargo versions ignore it.This change is