Skip to content

Build compiletest with in-tree libtest - #68019

Merged
bors merged 3 commits into
rust-lang:masterfrom
cuviper:in-tree-compiletest
Jan 10, 2020
Merged

Build compiletest with in-tree libtest#68019
bors merged 3 commits into
rust-lang:masterfrom
cuviper:in-tree-compiletest

Conversation

@cuviper

Copy link
Copy Markdown
Member

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

r? @nikomatsakis

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

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

Copy link
Copy Markdown
MemberAuthor

r? @Mark-Simulacrum

@Mark-Simulacrum

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

bors commented Jan 8, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 51b7044 has been approved by Mark-Simulacrum

@borsbors 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
Copy Markdown
MemberAuthor

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
Copy Markdown
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
Copy Markdown
MemberAuthor

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

@cuviper
cuviperforce-pushed the in-tree-compiletest branch from 6d01359 to 686d5f8CompareJanuary 8, 2020 23:13
@Mark-Simulacrum

Copy link
Copy Markdown
Member

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

@bors r+

@bors

bors commented Jan 8, 2020

Copy link
Copy Markdown
Collaborator

📌 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. Fixesrust-lang#59264.
As a minor cleanup, this also removes the unused `llvm_tools` flag.
@CentrilCentril mentioned this pull request Jan 9, 2020
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. Fixesrust-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. Fixesrust-lang#59264.
As a minor cleanup, this also removes the unused `llvm_tools` flag.
@CentrilCentril mentioned this pull request Jan 10, 2020
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. Fixesrust-lang#59264.
As a minor cleanup, this also removes the unused `llvm_tools` flag.
@JohnTitorJohnTitor mentioned this pull request Jan 10, 2020
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. Fixesrust-lang#59264.
As a minor cleanup, this also removes the unused `llvm_tools` flag.
@JohnTitorJohnTitor mentioned this pull request Jan 10, 2020
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:masterJan 10, 2020
@mati865mati865 mentioned this pull request Jan 29, 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.
Zalathar added a commit to Zalathar/rust that referenced this pull request Apr 8, 2025
…t-libtest, r=jieyouxu,kobzol
make it possible to use stage0 libtest on compiletest
With rust-lang#119899, building the library tree will require a stage 1 compiler. This is because `compiletest` is defined as a `ToolStd` (since rust-lang#68019) in order to use the in-tree library. As a result, rust-lang#119899 makes certain development workflows more difficult as changes on the compiler tree will now require recompiling `compiletest` each time.
This PR allows switching `ToolStd` to `ToolBootstrap` with a simple boolean option in `bootstrap.toml` to allow `compiletest` to use the stage 0 `libtest` instead.
The changes under `src/ci` are clearly intended to make sure that `compiletest` doesn't break during future bootstrap beta bumps.
Zalathar added a commit to Zalathar/rust that referenced this pull request Apr 8, 2025
…t-libtest, r=jieyouxu,kobzol
make it possible to use stage0 libtest on compiletest
With rust-lang#119899, building the library tree will require a stage 1 compiler. This is because `compiletest` is defined as a `ToolStd` (since rust-lang#68019) in order to use the in-tree library. As a result, rust-lang#119899 makes certain development workflows more difficult as changes on the compiler tree will now require recompiling `compiletest` each time.
This PR allows switching `ToolStd` to `ToolBootstrap` with a simple boolean option in `bootstrap.toml` to allow `compiletest` to use the stage 0 `libtest` instead.
The changes under `src/ci` are clearly intended to make sure that `compiletest` doesn't break during future bootstrap beta bumps.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 8, 2025
Rollup merge of rust-lang#139386 - onur-ozkan:configurable-compiletest-libtest, r=jieyouxu,kobzol
make it possible to use stage0 libtest on compiletest
With rust-lang#119899, building the library tree will require a stage 1 compiler. This is because `compiletest` is defined as a `ToolStd` (since rust-lang#68019) in order to use the in-tree library. As a result, rust-lang#119899 makes certain development workflows more difficult as changes on the compiler tree will now require recompiling `compiletest` each time.
This PR allows switching `ToolStd` to `ToolBootstrap` with a simple boolean option in `bootstrap.toml` to allow `compiletest` to use the stage 0 `libtest` instead.
The changes under `src/ci` are clearly intended to make sure that `compiletest` doesn't break during future bootstrap beta bumps.
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Apr 28, 2025
…, r=jieyouxu,kobzol
make it possible to use stage0 libtest on compiletest
With rust-lang/rust#119899, building the library tree will require a stage 1 compiler. This is because `compiletest` is defined as a `ToolStd` (since rust-lang/rust#68019) in order to use the in-tree library. As a result, rust-lang/rust#119899 makes certain development workflows more difficult as changes on the compiler tree will now require recompiling `compiletest` each time.
This PR allows switching `ToolStd` to `ToolBootstrap` with a simple boolean option in `bootstrap.toml` to allow `compiletest` to use the stage 0 `libtest` instead.
The changes under `src/ci` are clearly intended to make sure that `compiletest` doesn't break during future bootstrap beta bumps.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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

@cuviper@rust-highfive@Mark-Simulacrum@bors@nikomatsakis