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

auto-detect no_std where possible #3000

Merged
merged 1 commit into from Oct 5, 2023
Merged

auto-detect no_std where possible #3000

merged 1 commit into from Oct 5, 2023

Conversation

RalfJung
Copy link
Member

@rustbot
Copy link
Collaborator

rustbot commented Jul 31, 2023

Error: The feature assign is not enabled in this repository.
To enable it add its section in the triagebot.toml in the root of the repository.

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #t-infra on Zulip.

oli-obk
oli-obk reviewed Jul 31, 2023
View reviewed changes
ci.sh Show resolved Hide resolved
oli-obk
oli-obk reviewed Jul 31, 2023
View reviewed changes
cargo-miri/src/setup.rs Outdated
|| target.contains("nvptx")
|| target.contains("switch")
|| target.contains("-uefi");
let sysroot_config = if no_std || std::env::var_os("MIRI_NO_STD").is_some() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to be able to disable the heuristic with MIRI_NO_STD=0?

@RalfJung
Copy link
Member Author

RalfJung commented Jul 31, 2023 •
edited

Ah, the test suite also checks the env var, for building the dependencies

miri/tests/compiletest.rs

Line 97 in defbb66

let use_std = env::var_os("MIRI_NO_STD").is_none();

I don't think I want to repeat the target name check there, that seems a bit too ugly...

@RalfJung
Copy link
Member Author

I wonder if we could have ui_test only build the dependencies if at least one test matches the filter? That would elegantly avoid the need for the MIRI_NO_STD check.

@oli-obk
Copy link
Contributor

oli-obk commented Jul 31, 2023

Yea, I'm working on this, but it's a bigger refactoring to do it nicely. If you want it fast I can build a hacky version of it.

@RalfJung
Copy link
Member Author

Nah, this is not urgent.

@RalfJung RalfJung added the S-blocked Status: blocked on something happening somewhere else label Aug 21, 2023
@RalfJung
Copy link
Member Author

Marking as blocked on #3008

@oli-obk
Copy link
Contributor

oli-obk commented Oct 4, 2023

I wonder if we could have ui_test only build the dependencies if at least one test matches the filter? That would elegantly avoid the need for the MIRI_NO_STD check.

this is happening now

@RalfJung RalfJung force-pushed the no_std branch 2 times, most recently from 7822ab9 to 10617d6 Compare October 4, 2023 20:11
@RalfJung
Copy link
Member Author

RalfJung commented Oct 4, 2023

Looks like that is working. :)
@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Waiting for a review to complete and removed S-blocked Status: blocked on something happening somewhere else labels Oct 4, 2023
@oli-obk
Copy link
Contributor

oli-obk commented Oct 5, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 5, 2023

📌 Commit 73e6206 has been approved by oli-obk

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Oct 5, 2023

⌛ Testing commit 73e6206 with merge 0d6f605...

@bors
Copy link
Collaborator

bors commented Oct 5, 2023

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 0d6f605 to master...

1 similar comment
@bors
Copy link
Collaborator

bors commented Oct 5, 2023

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 0d6f605 to master...

@bors bors merged commit 0d6f605 into rust-lang:master Oct 5, 2023
8 checks passed
@RalfJung RalfJung deleted the no_std branch October 5, 2023 07:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees
No one assigned
Labels
S-waiting-on-review Status: Waiting for a review to complete
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@RalfJung @rustbot @oli-obk @bors