mirror of
https://github.com/bevyengine/bevy
synced 2024-11-21 20:23:28 +00:00
Update compile test to use ui_test 0.23 (#13245)
# Objective Closes #13241 ## Solution Update test utils to use `ui_test` 0.23.0. ## Testing - Run compile tests for bevy_ecs. cc @BD103
This commit is contained in:
parent
a22ecede49
commit
423a4732c3
6 changed files with 23 additions and 10 deletions
|
@ -18,6 +18,7 @@ exclude = [
|
|||
"crates/bevy_derive/compile_fail",
|
||||
"crates/bevy_ecs/compile_fail",
|
||||
"crates/bevy_reflect/compile_fail",
|
||||
"tools/compile_fail_utils",
|
||||
]
|
||||
members = [
|
||||
"crates/*",
|
||||
|
|
|
@ -8,8 +8,7 @@ license = "MIT OR Apache-2.0"
|
|||
publish = false
|
||||
|
||||
[dependencies]
|
||||
# ui_test dies if we don't specify the version. See oli-obk/ui_test#211
|
||||
bevy_derive = { path = "../", version = "0.14.0-dev" }
|
||||
bevy_derive = { path = "../" }
|
||||
|
||||
[dev-dependencies]
|
||||
compile_fail_utils = { path = "../../../tools/compile_fail_utils" }
|
||||
|
|
|
@ -8,8 +8,7 @@ license = "MIT OR Apache-2.0"
|
|||
publish = false
|
||||
|
||||
[dependencies]
|
||||
# ui_test dies if we don't specify the version. See oli-obk/ui_test#211
|
||||
bevy_ecs = { path = "../", version = "0.14.0-dev" }
|
||||
bevy_ecs = { path = "../" }
|
||||
|
||||
[dev-dependencies]
|
||||
compile_fail_utils = { path = "../../../tools/compile_fail_utils" }
|
||||
|
|
|
@ -8,8 +8,7 @@ license = "MIT OR Apache-2.0"
|
|||
publish = false
|
||||
|
||||
[dependencies]
|
||||
# ui_test dies if we don't specify the version. See oli-obk/ui_test#211
|
||||
bevy_reflect = { path = "../", version = "0.14.0-dev" }
|
||||
bevy_reflect = { path = "../" }
|
||||
|
||||
[dev-dependencies]
|
||||
compile_fail_utils = { path = "../../../tools/compile_fail_utils" }
|
||||
|
|
|
@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
|
|||
publish = false
|
||||
|
||||
[dependencies]
|
||||
ui_test = "0.22.3"
|
||||
ui_test = "0.23.0"
|
||||
|
||||
[[test]]
|
||||
name = "example"
|
||||
|
|
|
@ -7,7 +7,10 @@ use std::{
|
|||
pub use ui_test;
|
||||
|
||||
use ui_test::{
|
||||
default_file_filter, default_per_file_config, run_tests_generic,
|
||||
default_file_filter, default_per_file_config,
|
||||
dependencies::DependencyBuilder,
|
||||
run_tests_generic,
|
||||
spanned::Spanned,
|
||||
status_emitter::{Gha, StatusEmitter, Text},
|
||||
Args, Config, OutputConflictHandling,
|
||||
};
|
||||
|
@ -15,10 +18,14 @@ use ui_test::{
|
|||
/// Use this instead of hand rolling configs.
|
||||
///
|
||||
/// `root_dir` is the directory your tests are contained in. Needs to be a path from crate root.
|
||||
/// This config will build dependencies and will assume that the cargo manifest is placed at the
|
||||
/// current working directory.
|
||||
fn basic_config(root_dir: impl Into<PathBuf>, args: &Args) -> Config {
|
||||
let mut config = Config {
|
||||
dependencies_crate_manifest_path: Some("Cargo.toml".into()),
|
||||
bless_command: Some("`cargo test` with the BLESS environment variable set to any non empty value".to_string()),
|
||||
bless_command: Some(
|
||||
"`cargo test` with the BLESS environment variable set to any non empty value"
|
||||
.to_string(),
|
||||
),
|
||||
output_conflict_handling: if env::var_os("BLESS").is_some() {
|
||||
OutputConflictHandling::Bless
|
||||
} else {
|
||||
|
@ -45,6 +52,14 @@ fn basic_config(root_dir: impl Into<PathBuf>, args: &Args) -> Config {
|
|||
"$HOME",
|
||||
);
|
||||
|
||||
// Manually insert @aux-build:<dep> comments into test files. This needs to
|
||||
// be done to build and link dependencies. Dependencies will be pulled from a
|
||||
// Cargo.toml file.
|
||||
config.comment_defaults.base().custom.insert(
|
||||
"dependencies",
|
||||
Spanned::dummy(vec![Box::new(DependencyBuilder::default())]),
|
||||
);
|
||||
|
||||
config
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue