Skip to content

Don't leave root during bench-check. #24248

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

Open
larsraph wants to merge 9 commits into
base: main
Choose a base branch
from
+10 −16
Open

Don't leave root during bench-check. #24248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7298c16
Make path not leave root.
larsraph May 11, 2026
dd76544
Remove target-dir override in bench-check
larsraph May 11, 2026
ad0747f
Fixed CompileFail comment dirs.
larsraph May 11, 2026
fcd2a37
Use manifest-path instead of subdir to share target-dir for CompileFa…
larsraph May 11, 2026
e515a8d
Revert "Use manifest-path instead of subdir to share target-dir for C…
larsraph May 11, 2026
b9a07d3
Don't specify target-dir is CompileFail tests.
larsraph May 11, 2026
b7fab7c
Change bench-check to use subdir to follow pattern established by com…
larsraph May 12, 2026
7f3a363
fixed comment bevy_macros -> bevy_derive
larsraph May 12, 2026
d229f86
Switch to workspace qualifiers.
larsraph May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions tools/ci/src/commands/bench_check.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ impl Prepare for BenchCheckCommand {
let jobs = args.build_jobs();

vec![PreparedCommand::new::<Self>(
cmd!(
sh,
"cargo check --benches {jobs...} --target-dir ../target --manifest-path ./benches/Cargo.toml"
),
cmd!(sh, "cargo check -p benches --benches {jobs...}"),
"Failed to check the benches.",
)]
}
Expand Down
21 changes: 9 additions & 12 deletions tools/ci/src/commands/compile_fail.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,32 @@ impl Prepare for CompileFailCommand {

// Macro Compile Fail Tests
// Run tests (they do not get executed with the workspace tests)
// - See crates/bevy_macros_compile_fail_tests/README.md
// - See crates/bevy_derive/compile_fail/README.md
commands.push(
PreparedCommand::new::<Self>(
cmd!(sh, "cargo test --target-dir ../../../target {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}"),
cmd!(sh, "cargo test -p bevy_derive_compile_fail {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}"),
"Compiler errors of the macros compile fail tests seem to be different than expected! Check locally and compare rust versions.",
)
.with_subdir("crates/bevy_derive/compile_fail"),
),
);

// ECS Compile Fail Tests
// Run UI tests (they do not get executed with the workspace tests)
// - See crates/bevy_ecs_compile_fail_tests/README.md
// - See crates/bevy_ecs/compile_fail/README.md
commands.push(
PreparedCommand::new::<Self>(
cmd!(sh, "cargo test --target-dir ../../../target {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}"),
cmd!(sh, "cargo test -p bevy_ecs_compile_fail {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}"),
"Compiler errors of the ECS compile fail tests seem to be different than expected! Check locally and compare rust versions.",
)
.with_subdir("crates/bevy_ecs/compile_fail"),
),
);

// Reflect Compile Fail Tests
// Run tests (they do not get executed with the workspace tests)
// - See crates/bevy_reflect_compile_fail_tests/README.md
// - See crates/bevy_reflect/compile_fail/README.md
commands.push(
PreparedCommand::new::<Self>(
cmd!(sh, "cargo test --target-dir ../../../target {no_fail_fast...} {jobs...} -- {test_threads...}"),
cmd!(sh, "cargo test -p bevy_reflect_compile_fail {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}"),
"Compiler errors of the Reflect compile fail tests seem to be different than expected! Check locally and compare rust versions.",
)
.with_subdir("crates/bevy_reflect/compile_fail"),
),
);

commands
Expand Down
Loading