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.

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

test: replace x86_64-bare-metal.json with x86_64-unknown-none #477

Merged
merged 4 commits into from
Apr 5, 2024

Conversation

mkroening
Copy link
Member

@mkroening mkroening commented Apr 4, 2024

This avoids breakage such as #460 in the future.

Copy link
Member

@phil-opp phil-opp left a comment

Choose a reason for hiding this comment

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

Thanks!

@phil-opp
Copy link
Member

phil-opp commented Apr 4, 2024

Looks like cargo xbuild does not support .cargo/config.toml files yet. Maybe it's enough to change these lines:

https://github.com/rust-osdev/cargo-xbuild/blob/4dd5dbb579bca07e4066cd25a4c99b36fb5ea1ae/src/cargo.rs#L187-L192

Alternatively, we could finally switch our test framework to -Zbuild-std.

@Freax13 @josephlr What do you think?

@Freax13
Copy link
Member

Freax13 commented Apr 4, 2024

Looks like cargo xbuild does not support .cargo/config.toml files yet. Maybe it's enough to change these lines:

https://github.com/rust-osdev/cargo-xbuild/blob/4dd5dbb579bca07e4066cd25a4c99b36fb5ea1ae/src/cargo.rs#L187-L192

Alternatively, we could finally switch our test framework to -Zbuild-std.

@Freax13 @josephlr What do you think?

Switching to -Zbuild-std sounds good to me.

@mkroening
Copy link
Member Author

Switching to -Zbuild-std sounds good to me.

I'll take a look in the coming days. :)

@mkroening mkroening changed the title fix(test): rename .cargo/config to .cargo/config.toml test: replace x86_64-bare-metal.json with x86_64-unknown-none Apr 5, 2024
@mkroening
Copy link
Member Author

I have now pushed commits to gradually move away from xbuild to -Zbuild-std to using x86_64-unknown-none (without -Zbuild-std).

What do you think? :)

Copy link
Member

@phil-opp phil-opp left a comment

Choose a reason for hiding this comment

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

Great, thanks!

@phil-opp phil-opp merged commit b70e8bc into rust-osdev:master Apr 5, 2024
12 checks passed
@mkroening mkroening deleted the config-toml branch April 5, 2024 10:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants