fix miri target information for Test step #117287

onur-ozkan · 2023-10-27T15:22:11Z

self-explanatory

r? RalfJung

Signed-off-by: onur-ozkan <[email protected]>

RalfJung · 2023-10-27T15:36:17Z

src/bootstrap/src/core/build_steps/test.rs

@@ -629,7 +629,7 @@ impl Step for Miri {
            SourceType::InTree,
            &[],
        );
-        let _guard = builder.msg_sysroot_tool(Kind::Test, compiler.stage, "miri", host, host);
+        let _guard = builder.msg_sysroot_tool(Kind::Test, compiler.stage, "miri", host, target);


Looks like fff8223 duplicated a bunch of logic and some of it is wrong? I didn't think each test step has to do its own printing, and I think Miri had a "Testing Miri" header before fff8223... but I might misremember.

Looks like fff8223 duplicated a bunch of logic and some of it is wrong?

Others don't support the target field yet.

RalfJung · 2023-10-27T15:36:59Z

I don't understand the code but I guess this makes sense. 🤷

@bors r+ rollup

bors · 2023-10-27T15:37:01Z

📌 Commit b915fc8 has been approved by RalfJung

It is now in the queue for this repository.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#116834 (Remove `rustc_symbol_mangling/messages.ftl`.) - rust-lang#117212 (Properly restore snapshot when failing to recover parsing ternary) - rust-lang#117246 (Fix ICE: Restrict param constraint suggestion) - rust-lang#117247 (NVPTX: Allow PassMode::Direct for ptx kernels for now) - rust-lang#117270 (Hide internal methods from documentation) - rust-lang#117281 (std::thread : add SAFETY comment) - rust-lang#117287 (fix miri target information for Test step) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#117287 - onur-ozkan:fix-miri-target-info, r=RalfJung fix miri target information for Test step self-explanatory r? RalfJung

fix miri target information for Test step

b915fc8

Signed-off-by: onur-ozkan <[email protected]>

rustbot assigned RalfJung Oct 27, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Oct 27, 2023

RalfJung reviewed Oct 27, 2023

View reviewed changes

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 Oct 27, 2023

matthiaskrgr mentioned this pull request Oct 27, 2023

Rollup of 7 pull requests #117294

Merged

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 27, 2023

Unrolled build for rust-lang#117287

59ea1fc

Rollup merge of rust-lang#117287 - onur-ozkan:fix-miri-target-info, r=RalfJung fix miri target information for Test step self-explanatory r? RalfJung

bors merged commit b9015da into rust-lang:master Oct 27, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 27, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

onur-ozkan deleted the fix-miri-target-info branch January 27, 2024 09:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix miri target information for Test step #117287

fix miri target information for Test step #117287

onur-ozkan commented Oct 27, 2023

RalfJung Oct 27, 2023

onur-ozkan Oct 27, 2023

RalfJung commented Oct 27, 2023

bors commented Oct 27, 2023

fix miri target information for Test step #117287

fix miri target information for Test step #117287

Conversation

onur-ozkan commented Oct 27, 2023

RalfJung Oct 27, 2023

Choose a reason for hiding this comment

onur-ozkan Oct 27, 2023

Choose a reason for hiding this comment

RalfJung commented Oct 27, 2023

bors commented Oct 27, 2023