Skip to content
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.

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

Use workspace.default-members to specify default crates for cargo build #19476

Merged
merged 5 commits into from Dec 7, 2017

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Dec 4, 2017

… 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.


This change is Reviewable

@nox
Copy link
Member

nox commented Dec 4, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Dec 4, 2017

📌 Commit 246475c has been approved by nox

@nox
Copy link
Member

nox commented Dec 4, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Dec 4, 2017

📌 Commit 55ddf45 has been approved by nox

@jdm
Copy link
Member

jdm commented Dec 4, 2017

@bors-servo: treeclosed=9000
Going to try restarting buildbot on a couple builders.

@bors-servo
Copy link
Contributor

bors-servo commented Dec 5, 2017

The latest upstream changes (presumably #19457) made this pull request unmergeable. Please resolve the merge conflicts.

@SimonSapin SimonSapin force-pushed the default-members branch from 55ddf45 to 4f29093 Dec 5, 2017
@SimonSapin
Copy link
Member Author

SimonSapin commented Dec 5, 2017

Rebased without conflict. (Maybe GitHub uses a different automatic conflict resolution algorithm than my git client?)

@bors-servo r=nox

@bors-servo
Copy link
Contributor

bors-servo commented Dec 5, 2017

📌 Commit 4f29093 has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented Dec 5, 2017

Testing commit 4f29093 with merge 7175653...

bors-servo added 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 -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 5, 2017

💔 Test failed - linux-rel-wpt

@jdm
Copy link
Member

jdm commented Dec 5, 2017

@bors-servo: retry

  • "couldn't compile style"?
@SimonSapin
Copy link
Member Author

SimonSapin commented Dec 5, 2017

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
Copy link
Contributor

bors-servo commented Dec 5, 2017

Testing commit 4f29093 with merge b7fa079...

bors-servo added 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 -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 7, 2017

💔 Test failed - mac-rel-wpt3

@SimonSapin
Copy link
Member Author

SimonSapin commented Dec 7, 2017

--- stderr
error: Connection to server timed out
make[2]: *** [CMakeFiles/ogg.dir/gecko/src/media/libogg/src/ogg_alloc.c.o] Error 2
make[1]: *** [CMakeFiles/ogg.dir/all] Error 2
make: *** [all] Error 2

I also get this when running ./mach test-unit on my machine:

rustdoc: Option 'document-private-items' given more than once
SimonSapin added 5 commits Dec 4, 2017
This will allow writing `tests/unit/*` in the root `Cargo.toml` file
to designate Servo unit tests.
…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 SimonSapin force-pushed the default-members branch from 99c3df7 to 1f2b66e Dec 7, 2017
@SimonSapin
Copy link
Member Author

SimonSapin commented Dec 7, 2017

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

@bors-servo
Copy link
Contributor

bors-servo commented Dec 7, 2017

📌 Commit 1f2b66e has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented Dec 7, 2017

Testing commit 1f2b66e with merge df68eea...

bors-servo added 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 -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 7, 2017

@bors-servo bors-servo merged commit 1f2b66e into master Dec 7, 2017
2 of 4 checks passed
2 of 4 checks passed
continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
dependency-ci An error occured
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@SimonSapin SimonSapin deleted the default-members branch Dec 7, 2017
emilio added a commit to emilio/servo that referenced this pull request Dec 9, 2017
bors-servo added 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 added 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 added 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 added 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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.