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.

Sign up for GitHub

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

Jump to bottom

Fix cargo staging for run-make tests #130739

Merged
merged 4 commits into from
Sep 25, 2024
Merged

Fix cargo staging for run-make tests #130739

merged 4 commits into from
Sep 25, 2024

Commits on Sep 24, 2024

  1. Pass bootstrap cargo when --stage 0 and COMPILETST_FORCE_STAGE0 

    And stop passing `BOOTSTRAP_CARGO` as an env var, instead the provided
cargo should go through `--cargo-path.`
    @jieyouxu
    jieyouxu committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    6d132d9 View commit details
    Browse the repository at this point in the history

  2. Fix tool cargo being off-by-one from rustc staging 

    Previously if you pass compiler stage 1 to `tool::Cargo`, it will build
stage2 rustc and give you back a cargo built with stage2 rustc, which is
not what we want.

This commit adds a hack that chops off a stage from the compiler passed
to `tool::Cargo`, meaning that we will get a cargo built with stage 1
compiler, avoiding unnecessary and incorrect build of stage2 rustc and
the cargo built by that.
    @jieyouxu
    jieyouxu committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    705ab17 View commit details
    Browse the repository at this point in the history

  3. Fix run-make-support to respect per-stage cargo

    @jieyouxu
    jieyouxu committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    5389792 View commit details
    Browse the repository at this point in the history

  4. Update run-make tests to use cargo wrapper cmd

    @jieyouxu
    jieyouxu committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    f548216 View commit details
    Browse the repository at this point in the history