Add support for inputing via stdin with run-make-support by Urgau · Pull Request #124612 · rust-lang/rust

Urgau · 2024-05-02T10:21:21Z

This PR adds the facility to set a input bytes that will be passed via the standard input.

This is useful for testing rustc - (and soon rustdoc -).

In #124611 took the approach of having a dedicated run method but it is not very convenient to use and would necessitate many functions, one for success, one for fail, ...

Instead this PR takes a different approach and allows setting the input bytes as if it were a parameter and when calling the (now custom) output function, we write the input bytes into stdin. I think this gives us maximum flexibility in the implementation and a simple interface for users.

To test this new logic I ported tests/run-make/stdin-non-utf8/ to an rmake.rs one.

r? @jieyouxu

rustbot · 2024-05-02T10:21:31Z

Some changes occurred in run-make tests.

cc @jieyouxu

The run-make-support library was changed

cc @jieyouxu

jieyouxu

I like how the API looks with custom stdin. One nit about the comment, after that r=me.

src/tools/run-make-support/src/lib.rs

jieyouxu

Thanks! r=me after CI is green.

jieyouxu · 2024-05-02T19:10:03Z

@bors delegate=Urgau

bors · 2024-05-02T19:10:06Z

✌️ @Urgau, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

Urgau · 2024-05-02T19:59:12Z

@bors r=@jieyouxu

bors · 2024-05-02T19:59:14Z

📌 Commit 619a569 has been approved by jieyouxu

It is now in the queue for this repository.

Add support for inputing via stdin with run-make-support This PR adds the facility to set a input bytes that will be passed via the standard input. This is useful for testing `rustc -` (and soon `rustdoc -`). In rust-lang#124611 took the approach of having a dedicated `run` method but it is not very convenient to use and would necessitate many functions, one for success, one for fail, ... Instead this PR takes a different approach and allows setting the input bytes as if it were a parameter and when calling the (now custom) `output` function, we write the input bytes into stdin. I think this gives us maximum flexibility in the implementation and a simple interface for users. To test this new logic I ported `tests/run-make/stdin-non-utf8/` to an `rmake.rs` one. r? ``@jieyouxu``

Rollup of 8 pull requests Successful merges: - rust-lang#124412 (io safety: update Unix explanation to use `Arc`) - rust-lang#124441 (String.truncate comment microfix (greater or equal)) - rust-lang#124594 (run-make-support: preserve tooks.mk behavior for EXTRACXXFLAGS) - rust-lang#124604 (library/std: Remove unused `gimli-symbolize` feature) - rust-lang#124607 (`rustc_expand` cleanups) - rust-lang#124609 (variable-precision float operations can differ depending on optimization levels) - rust-lang#124610 (Tweak `consts_may_unify`) - rust-lang#124612 (Add support for inputing via stdin with run-make-support) r? `@ghost` `@rustbot` modify labels: rollup

fmease · 2024-05-03T03:24:28Z

Failed in rollup: #124643 (comment)
@bors r-

Urgau · 2024-05-03T07:12:31Z

auto - x86_64-msvc
2024-05-03T03:20:02.5274177Z assertion failed: out_dir.join("rust_out").try_exists().unwrap()

😮‍💨, I think I will always forget that Windows has .exe as suffix to executables. Adjusted the test for that, CI passes, let's try again.

@bors r=@jieyouxu

bors · 2024-05-03T07:12:34Z

📌 Commit 2c4214e has been approved by jieyouxu

It is now in the queue for this repository.

ChrisDenton · 2024-05-03T09:01:38Z

Ideally this would use std::env::consts::EXE_SUFFIX so it wouldn't break if another platform would ever need an extension added.

Urgau · 2024-05-03T09:21:05Z

Ideally this would use std::env::consts::EXE_SUFFIX so it wouldn't break if another platform would ever need an extension added.

I agree, that would be better, but I think the rmake.rs files are compiled for the current architecture (so they can be run) and so using std::env::consts::EXE_SUFFIX would break in case of cross-compilation.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#124461 (handle the targets that are missing in stage0) - rust-lang#124492 (Generalize `adjust_from_tcx` for `Allocation`) - rust-lang#124588 (Use `ObligationCtxt` in favor of `TraitEngine` in many more places) - rust-lang#124612 (Add support for inputing via stdin with run-make-support) - rust-lang#124613 (Allow fmt to run on rmake.rs test files) - rust-lang#124649 (Fix HorizonOS build broken by rust-lang#124210) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#124612 - Urgau:run-make-stdin, r=jieyouxu Add support for inputing via stdin with run-make-support This PR adds the facility to set a input bytes that will be passed via the standard input. This is useful for testing `rustc -` (and soon `rustdoc -`). In rust-lang#124611 took the approach of having a dedicated `run` method but it is not very convenient to use and would necessitate many functions, one for success, one for fail, ... Instead this PR takes a different approach and allows setting the input bytes as if it were a parameter and when calling the (now custom) `output` function, we write the input bytes into stdin. I think this gives us maximum flexibility in the implementation and a simple interface for users. To test this new logic I ported `tests/run-make/stdin-non-utf8/` to an `rmake.rs` one. r? `@jieyouxu`

rustbot assigned jieyouxu May 2, 2024

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 May 2, 2024

Urgau mentioned this pull request May 2, 2024

Add - (stdin) support in rustdoc #124611

Merged

jieyouxu approved these changes May 2, 2024

View reviewed changes

src/tools/run-make-support/src/lib.rs Show resolved Hide resolved

run-make-support: add support for stdin input with rustc/rustdoc

0a03b09

Urgau force-pushed the run-make-stdin branch from 6716b76 to 619a569 Compare May 2, 2024 19:07

jieyouxu approved these changes May 2, 2024

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 May 2, 2024

fmease mentioned this pull request May 3, 2024

Rollup of 8 pull requests #124643

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 3, 2024

run-make: port stdin-rustc to Rust-based rmake.rs

2c4214e

Urgau force-pushed the run-make-stdin branch from 619a569 to 2c4214e Compare May 3, 2024 06:10

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 3, 2024

matthiaskrgr mentioned this pull request May 3, 2024

Rollup of 6 pull requests #124660

Merged

bors merged commit c27d3d5 into rust-lang:master May 3, 2024

rustbot added this to the 1.80.0 milestone May 3, 2024

jieyouxu mentioned this pull request Jun 9, 2024

Tracking Issue for porting run-make tests to use Rust #121876

Closed

Uh oh!

Conversation

Urgau commented May 2, 2024

Uh oh!

rustbot commented May 2, 2024

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented May 2, 2024

Uh oh!

bors commented May 2, 2024

Uh oh!

Urgau commented May 2, 2024

Uh oh!

bors commented May 2, 2024

Uh oh!

fmease commented May 3, 2024

Uh oh!

Urgau commented May 3, 2024

Uh oh!

bors commented May 3, 2024

Uh oh!

ChrisDenton commented May 3, 2024

Uh oh!

Urgau commented May 3, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants