Try to make top-level Cargo.toml work without __CARGO_TEST_ROOT.#56194
Merged
bors merged 3 commits intorust-lang:masterfrom Nov 26, 2018
Merged
Try to make top-level Cargo.toml work without __CARGO_TEST_ROOT.#56194bors merged 3 commits intorust-lang:masterfrom
bors merged 3 commits intorust-lang:masterfrom
Conversation
Contributor
|
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Collaborator
|
📌 Commit 894fd10 has been approved by |
bors
added
S-waiting-on-bors
Collaborator
bors
added a commit
that referenced
this pull request
Nov 24, 2018
Try to make top-level Cargo.toml work without __CARGO_TEST_ROOT.
The last failures I noticed before adding the `__CARGO_TEST_ROOT` hack were in `src/test/run-make/thumb-none-{cortex-m,qemu}`, and had to do with the fact that the top-level `Cargo.toml` uses nightly Cargo features.
If that's the only problem, this PR should work, and we can figure out how to unbreak RLS.
Collaborator
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Member
Author
So it is indeed an error, not just a warning. |
kennytm
added
S-waiting-on-author
Member
|
r=me if this strategy passes tests! |
Member
Author
|
@alexcrichton It doesn't ("error: current package believes it's in a workspace when it's not"). What we need is to either have the default be not treating a package as being in a workspace just because it's nested directory-wise (and only e.g. produce a warning), or have some opt-out mechanism (like Maybe a way to say that the |
Member
|
I believe as of recently cargo supports an |
Member
Author
|
Oh, heh, it was already used for something else, I just didn't notice! @bors r=alexcrichton |
Collaborator
|
📌 Commit 20461a22b1276da654fd4909847ee94ec459128f has been approved by |
bors
added
S-waiting-on-bors
Collaborator
|
⌛ Testing commit 20461a22b1276da654fd4909847ee94ec459128f with merge dbce8625f9d6a9528e14c6f0972f589dd39e63c2... |
Collaborator
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Member
Author
|
@alexcrichton Hmm, on the CI, the build dir is Alternatively, a tmp dir could be used for tescases that are also Cargo projects. |
Member
Author
|
@bors r=alexcrichton |
Collaborator
|
📌 Commit 6aa4eb9 has been approved by |
bors
added
S-waiting-on-bors
Collaborator
bors
added a commit
that referenced
this pull request
Nov 25, 2018
Try to make top-level Cargo.toml work without __CARGO_TEST_ROOT.
The last failures I noticed before adding the `__CARGO_TEST_ROOT` hack were in `src/test/run-make/thumb-none-{cortex-m,qemu}`, and had to do with the fact that the top-level `Cargo.toml` uses nightly Cargo features.
If that's the only problem, this PR should work, and we can figure out how to unbreak RLS.
Collaborator
|
☀️ Test successful - status-appveyor, status-travis |
Contributor
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Nov 26, 2018
Tested on commit rust-lang/rust@c14ab13. Direct link to PR: <rust-lang/rust#56194> 🎉 rls on windows: test-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra). 🎉 rls on linux: test-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
The last failures I noticed before adding the
__CARGO_TEST_ROOThack were insrc/test/run-make/thumb-none-{cortex-m,qemu}, and had to do with the fact that the top-levelCargo.tomluses nightly Cargo features.If that's the only problem, this PR should work, and we can figure out how to unbreak RLS.