Skip to content

checktools.sh: fix bashism #140917

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.

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

Merged
merged 1 commit into from
May 17, 2025
Merged

checktools.sh: fix bashism #140917

merged 1 commit into from
May 17, 2025

Conversation

RalfJung
Copy link
Member

Follow-up to #140903. Turns out tests/{pass,panic} only properly expands in bash, not in dash. :/

r? @WaffleLapkin

@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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels May 11, 2025
@Noratrieb
Copy link
Member

why do we even have /bin/sh shebangs, we could be free from this suffering with a little bit of /usr/bin/env bash

@RalfJung
Copy link
Member Author

Yeah probably, but that felt like a bigger change.^^

@RalfJung
Copy link
Member Author

All right, this time the tests actually got tested, and it took 54s. I assume that's okay in terms of CI time, but Cc @rust-lang/infra anyway for good measure.

@pietroalbini
Copy link
Member

Yeah that's fine.

@WaffleLapkin
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 16, 2025

📌 Commit f96fb61 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 May 16, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request May 17, 2025
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#135808 (Implement Display for ``rustc_target::callconv::Conv``)
 - rust-lang#137432 (Add as_ascii_unchecked() methods to char, u8, and str)
 - rust-lang#139103 (deduplicate abort implementations)
 - rust-lang#140917 (checktools.sh: fix bashism)
 - rust-lang#141035 (turn lld warning on old gccs into info log)
 - rust-lang#141118 (Enable rust-analyzer to go from query definition to the corresponding provider field)
 - rust-lang#141121 (Only select true errors in `impossible_predicates`)
 - rust-lang#141125 (check coroutines with `TypingMode::Borrowck` to avoid cyclic reasoning)
 - rust-lang#141131 (Make some `match`es slightly more ergonomic in `librustdoc`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f0b1150 into rust-lang:master May 17, 2025
6 checks passed
@rustbot rustbot added this to the 1.89.0 milestone May 17, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 17, 2025
Rollup merge of rust-lang#140917 - RalfJung:checktools, r=WaffleLapkin

checktools.sh: fix bashism

Follow-up to rust-lang#140903. Turns out `tests/{pass,panic}` only properly expands in bash, not in dash. :/

r? `@WaffleLapkin`
@RalfJung RalfJung deleted the checktools branch May 18, 2025 06:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants