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

Add target.*.runner configuration for targets #122108

Merged
merged 2 commits into from
Mar 11, 2024
Merged

Add target.*.runner configuration for targets #122108

merged 2 commits into from
Mar 11, 2024

Conversation

alexcrichton
Copy link
Member

This commit adds a runner field configuration to config.toml for specifying a wrapper executable when executing binaries for a target. This is pulled out of #122036 where a WebAssembly runtime is used, for example, to execute tests for wasm32-wasip1.

The name "runner" here is chosen to match Cargo's CARGO_*_RUNNER configuration, and to make things a bit more consistent this additionally renames compiletest's --runtool argument to --runner.

@rustbot
Copy link
Collaborator

rustbot commented Mar 6, 2024

r? @clubby789

rustbot has assigned @clubby789.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 Mar 6, 2024
@rustbot
Copy link
Collaborator

rustbot commented Mar 6, 2024

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

This PR modifies config.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@alexcrichton alexcrichton force-pushed the target-config-runtool branch from 49e3d0a to ed82e19 Compare March 6, 2024 20:33
@alexcrichton alexcrichton mentioned this pull request Mar 6, 2024
Merged
WaffleLapkin
WaffleLapkin approved these changes Mar 8, 2024
View reviewed changes
Copy link
Member

@WaffleLapkin WaffleLapkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice change, I already know how I can use this :3

I think you need to add the change to bootstrap change history. r=me after that though.

@WaffleLapkin WaffleLapkin added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 8, 2024
@alexcrichton
Add target.*.runner configuration for targets
dd95cb7 
This commit adds a `runner` field configuration to `config.toml` for
specifying a wrapper executable when executing binaries for a target.
This is pulled out of rust-lang#122036 where a WebAssembly runtime is used, for
example, to execute tests for `wasm32-wasip1`.

The name "runner" here is chosen to match Cargo's `CARGO_*_RUNNER`
configuration, and to make things a bit more consistent this
additionally renames compiletest's `--runtool` argument to `--runner`.
@alexcrichton alexcrichton force-pushed the target-config-runtool branch 2 times, most recently from 2398290 to 20f0b25 Compare March 8, 2024 15:45
@alexcrichton
Copy link
Member Author

alexcrichton commented Mar 8, 2024 •
edited
Loading

Ah sure! I wasn't sure if that was intended for all changes or just more major ones.

I wasn't sure what id to pick so I just added a hundred or so to the previous one (the ids appear to go up and down)

@clubby789
Copy link
Contributor

I believe the change ID should be the PR number. The comment at the top says it's sorted by merge date which explains the weird ordering - could probably do with some clarification

@alexcrichton alexcrichton force-pushed the target-config-runtool branch from 20f0b25 to 9bdb8a6 Compare March 8, 2024 19:25
@alexcrichton
Copy link
Member Author

Aha thank you for the clarification! I also see that I'm not very good at reading, so not necessarily a sign that anything needs to change other than my own reading comprehension

@alexcrichton
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 9, 2024
@workingjubilee
Copy link
Member

@bors r=WaffleLapkin

@bors
Copy link
Contributor

bors commented Mar 9, 2024

📌 Commit 9bdb8a6 has been approved by WaffleLapkin

It is now in the queue for this repository.

@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 Mar 9, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 10, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2024
@bors
Auto merge of rust-lang#122289 - matthiaskrgr:rollup-uik3gaz, r=matth…
a60ff62 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#121573 (unix_sigpipe: Add test for SIGPIPE disposition in child processes)
 - rust-lang#121754 ([bootstrap] Move the `split-debuginfo` setting to the per-target section)
 - rust-lang#122205 (ensure that sysroot is properly set for cross-targets)
 - rust-lang#122257 (mir-opt tests: don't run a different set on --bless; enable --keep-stage-std)
 - rust-lang#122272 (Subtree update of `rust-analyzer`)

Failed merges:

 - rust-lang#122108 (Add `target.*.runner` configuration for targets)

r? `@ghost`
`@rustbot` modify labels: rollup
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 11, 2024
@jhpratt
Rollup merge of rust-lang#122108 - alexcrichton:target-config-runtool…
a5f622b 
…, r=WaffleLapkin

Add `target.*.runner` configuration for targets

This commit adds a `runner` field configuration to `config.toml` for specifying a wrapper executable when executing binaries for a target. This is pulled out of rust-lang#122036 where a WebAssembly runtime is used, for example, to execute tests for `wasm32-wasip1`.

The name "runner" here is chosen to match Cargo's `CARGO_*_RUNNER` configuration, and to make things a bit more consistent this additionally renames compiletest's `--runtool` argument to `--runner`.
@jhpratt jhpratt mentioned this pull request Mar 11, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2024
@bors
Auto merge of rust-lang#122327 - jhpratt:rollup-q311wv9, r=jhpratt
c82742e 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#121148 (Add slice::try_range)
 - rust-lang#121573 (unix_sigpipe: Add test for SIGPIPE disposition in child processes)
 - rust-lang#121633 (Win10: Use `GetSystemTimePreciseAsFileTime` directly)
 - rust-lang#121840 (Expose the Freeze trait again (unstably) and forbid implementing it manually)
 - rust-lang#121907 (skip sanity check for non-host targets in `check` builds)
 - rust-lang#122002 (std::threads: revisit stack address calculation on netbsd.)
 - rust-lang#122108 (Add `target.*.runner` configuration for targets)
 - rust-lang#122298 (RawVec::into_box: avoid unnecessary intermediate reference)

r? `@ghost`
`@rustbot` modify labels: rollup
@jhpratt jhpratt mentioned this pull request Mar 11, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2024
@bors
Auto merge of rust-lang#122331 - jhpratt:rollup-cbl8xsy, r=jhpratt
e919669 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#121148 (Add slice::try_range)
 - rust-lang#121633 (Win10: Use `GetSystemTimePreciseAsFileTime` directly)
 - rust-lang#121840 (Expose the Freeze trait again (unstably) and forbid implementing it manually)
 - rust-lang#121907 (skip sanity check for non-host targets in `check` builds)
 - rust-lang#122002 (std::threads: revisit stack address calculation on netbsd.)
 - rust-lang#122108 (Add `target.*.runner` configuration for targets)
 - rust-lang#122298 (RawVec::into_box: avoid unnecessary intermediate reference)
 - rust-lang#122315 (Allow multiple `impl Into<{D,Subd}iagMessage>` parameters in a function.)
 - rust-lang#122326 (Optimize `process_heap_alloc`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9b30f01 into rust-lang:master Mar 11, 2024
11 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Mar 11, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2024
@rust-timer
Unrolled build for rust-lang#122108
664d404 
Rollup merge of rust-lang#122108 - alexcrichton:target-config-runtool, r=WaffleLapkin

Add `target.*.runner` configuration for targets

This commit adds a `runner` field configuration to `config.toml` for specifying a wrapper executable when executing binaries for a target. This is pulled out of rust-lang#122036 where a WebAssembly runtime is used, for example, to execute tests for `wasm32-wasip1`.

The name "runner" here is chosen to match Cargo's `CARGO_*_RUNNER` configuration, and to make things a bit more consistent this additionally renames compiletest's `--runtool` argument to `--runner`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WaffleLapkin WaffleLapkin WaffleLapkin approved these changes

Assignees

@WaffleLapkin WaffleLapkin

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.78.0
Development

Successfully merging this pull request may close these issues.
7 participants
@alexcrichton @rustbot @rust-log-analyzer @clubby789 @workingjubilee @bors @WaffleLapkin