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

Build compiletest with in-tree libtest #68019

Merged
merged 3 commits into from
Jan 10, 2020

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Jan 8, 2020

This updates compiletest to build in Mode::ToolStd, using the locally-built crates for std and especially test. This way we're immune to unstable differences in the bootstrap compiler crates, whether that's a prior-release stage0 or a current release local rebuild. Fixes #59264.

As a minor cleanup, this also removes the unused llvm_tools flag.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 8, 2020
@cuviper
Copy link
Member Author

cuviper commented Jan 8, 2020

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

One thing that I had wanted was to ban non-test use in compile test... But that can be left for the future, I guess.

@bors r+

@bors
Copy link
Contributor

bors commented Jan 8, 2020

📌 Commit 51b7044 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 8, 2020
@cuviper
Copy link
Member Author

cuviper commented Jan 8, 2020

One thing that I had wanted was to ban non-test use in compile test...

Is there a technical way to do that? Or did you just want a comment in the source?

@Mark-Simulacrum
Copy link
Member

I was thinking a comment might suffice :)

I'm also not sure how much benefit compiletest gets from depending on libtest -- it might be worth trying to just duplicate and minimize the code instead.

@cuviper
Copy link
Member Author

cuviper commented Jan 8, 2020

OK, there's a comment for you...

@cuviper cuviper force-pushed the in-tree-compiletest branch from 6d01359 to 686d5f8 Compare January 8, 2020 23:13
@Mark-Simulacrum
Copy link
Member

Great! Somehow I thought we were using more features (but maybe they've been stabilized since).

@bors r+

@bors
Copy link
Contributor

bors commented Jan 8, 2020

📌 Commit 686d5f8 has been approved by Mark-Simulacrum

Centril added a commit to Centril/rust that referenced this pull request Jan 9, 2020
…-Simulacrum

Build compiletest with in-tree libtest

This updates compiletest to build in `Mode::ToolStd`, using the locally-built crates for `std` and especially `test`. This way we're immune to unstable differences in the bootstrap compiler crates, whether that's a prior-release stage0 or a current release local rebuild. Fixes rust-lang#59264.

As a minor cleanup, this also removes the unused `llvm_tools` flag.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 10, 2020
…-Simulacrum

Build compiletest with in-tree libtest

This updates compiletest to build in `Mode::ToolStd`, using the locally-built crates for `std` and especially `test`. This way we're immune to unstable differences in the bootstrap compiler crates, whether that's a prior-release stage0 or a current release local rebuild. Fixes rust-lang#59264.

As a minor cleanup, this also removes the unused `llvm_tools` flag.
Centril added a commit to Centril/rust that referenced this pull request Jan 10, 2020
…-Simulacrum

Build compiletest with in-tree libtest

This updates compiletest to build in `Mode::ToolStd`, using the locally-built crates for `std` and especially `test`. This way we're immune to unstable differences in the bootstrap compiler crates, whether that's a prior-release stage0 or a current release local rebuild. Fixes rust-lang#59264.

As a minor cleanup, this also removes the unused `llvm_tools` flag.
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 10, 2020
…-Simulacrum

Build compiletest with in-tree libtest

This updates compiletest to build in `Mode::ToolStd`, using the locally-built crates for `std` and especially `test`. This way we're immune to unstable differences in the bootstrap compiler crates, whether that's a prior-release stage0 or a current release local rebuild. Fixes rust-lang#59264.

As a minor cleanup, this also removes the unused `llvm_tools` flag.
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 10, 2020
…-Simulacrum

Build compiletest with in-tree libtest

This updates compiletest to build in `Mode::ToolStd`, using the locally-built crates for `std` and especially `test`. This way we're immune to unstable differences in the bootstrap compiler crates, whether that's a prior-release stage0 or a current release local rebuild. Fixes rust-lang#59264.

As a minor cleanup, this also removes the unused `llvm_tools` flag.
bors added a commit that referenced this pull request Jan 10, 2020
Rollup of 8 pull requests

Successful merges:

 - #66045 (Add method Result::into_ok)
 - #67258 (Introduce `X..`, `..X`, and `..=X` range patterns)
 - #68014 (Unify output of "variant not found" errors)
 - #68019 (Build compiletest with in-tree libtest)
 - #68039 (remove explicit strip-hidden pass from compiler doc generation)
 - #68050 (Canonicalize rustc_error imports)
 - #68059 (Allow specifying LLVM args in target specifications)
 - #68075 (rustbuild: Cleanup book generation)

Failed merges:

 - #68089 (Unstabilize `Vec::remove_item`)

r? @ghost
@bors bors merged commit 686d5f8 into rust-lang:master Jan 10, 2020
@cuviper cuviper deleted the in-tree-compiletest branch April 3, 2020 18:38
cuviper added a commit to cuviper/rust that referenced this pull request Nov 18, 2020
We already set `compiletest` to use the local sysroot in rust-lang#68019, but
that missed the configuration for testing `compiletest` itself.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 19, 2020
…=Mark-Simulacrum

Make compiletest testing use the local sysroot

We already set `compiletest` to use the local sysroot in rust-lang#68019, but
that missed the configuration for testing `compiletest` itself.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 19, 2020
…=Mark-Simulacrum

Make compiletest testing use the local sysroot

We already set `compiletest` to use the local sysroot in rust-lang#68019, but
that missed the configuration for testing `compiletest` itself.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 19, 2020
…=Mark-Simulacrum

Make compiletest testing use the local sysroot

We already set `compiletest` to use the local sysroot in rust-lang#68019, but
that missed the configuration for testing `compiletest` itself.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

compiletest should be built with the stage2 compiler not the stage0 compiler
5 participants