Skip to content

Commit 7f6552f

Browse files
committed
adjust tests to changed names
1 parent 897531a commit 7f6552f

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

crates/cargo-gpu/src/config.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ mod test {
140140
],
141141
)
142142
.unwrap();
143-
assert!(args.build_args.debug);
143+
assert!(!args.build_args.spirv_builder.release);
144144
assert!(args.install.spirv_install.auto_install_rust_toolchain);
145145
}
146146

@@ -151,7 +151,7 @@ mod test {
151151
file.write_all(
152152
[
153153
"[package.metadata.rust-gpu.build]",
154-
"debug = true",
154+
"release = false",
155155
"[package.metadata.rust-gpu.install]",
156156
"auto-install-rust-toolchain = true",
157157
]
@@ -161,7 +161,7 @@ mod test {
161161
.unwrap();
162162

163163
let args = Config::clap_command_with_cargo_config(&shader_crate_path, vec![]).unwrap();
164-
assert!(args.build_args.debug);
164+
assert!(!args.build_args.spirv_builder.release);
165165
assert!(args.install.spirv_install.auto_install_rust_toolchain);
166166
}
167167

@@ -225,7 +225,7 @@ mod test {
225225
file.write_all(
226226
[
227227
"[package.metadata.rust-gpu.build]",
228-
"capability = [\"AtomicStorage\", \"Matrix\"]",
228+
"capabilities = [\"AtomicStorage\", \"Matrix\"]",
229229
]
230230
.join("\n")
231231
.as_bytes(),
@@ -234,10 +234,10 @@ mod test {
234234

235235
let args = Config::clap_command_with_cargo_config(&shader_crate_path, vec![]).unwrap();
236236
assert_eq!(
237-
args.build_args.capability,
237+
args.build_args.spirv_builder.capabilities,
238238
vec![
239-
spirv_builder_cli::spirv::Capability::AtomicStorage,
240-
spirv_builder_cli::spirv::Capability::Matrix
239+
spirv_builder::Capability::AtomicStorage,
240+
spirv_builder::Capability::Matrix
241241
]
242242
);
243243
}

crates/cargo-gpu/src/metadata.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ mod test {
168168
fn generates_defaults() {
169169
let json = serde_json::json!({});
170170
let configs = Metadata::merge_configs(&json, std::path::Path::new("./")).unwrap();
171-
assert_eq!(configs["build"]["debug"], serde_json::Value::Bool(false));
171+
assert_eq!(configs["build"]["release"], serde_json::Value::Bool(true));
172172
assert_eq!(
173173
configs["install"]["auto_install_rust_toolchain"],
174174
serde_json::Value::Bool(false)
@@ -180,15 +180,15 @@ mod test {
180180
let json = serde_json::json!(
181181
{ "metadata": { "rust-gpu": {
182182
"build": {
183-
"debug": true
183+
"release": false
184184
},
185185
"install": {
186186
"auto-install-rust-toolchain": true
187187
}
188188
}}}
189189
);
190190
let configs = Metadata::merge_configs(&json, std::path::Path::new("./")).unwrap();
191-
assert_eq!(configs["build"]["debug"], serde_json::Value::Bool(true));
191+
assert_eq!(configs["build"]["release"], serde_json::Value::Bool(false));
192192
assert_eq!(
193193
configs["install"]["auto_install_rust_toolchain"],
194194
serde_json::Value::Bool(true)
@@ -202,7 +202,7 @@ mod test {
202202
{ "packages": [{
203203
"metadata": { "rust-gpu": {
204204
"build": {
205-
"debug": true
205+
"release": false
206206
},
207207
"install": {
208208
"auto-install-rust-toolchain": true
@@ -212,7 +212,7 @@ mod test {
212212
}]}
213213
);
214214
let configs = Metadata::merge_configs(&json, marker.parent().unwrap()).unwrap();
215-
assert_eq!(configs["build"]["debug"], serde_json::Value::Bool(true));
215+
assert_eq!(configs["build"]["release"], serde_json::Value::Bool(false));
216216
assert_eq!(
217217
configs["install"]["auto_install_rust_toolchain"],
218218
serde_json::Value::Bool(true)

crates/cargo-gpu/src/spirv_cli.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@ impl Drop for SpirvCli {
491491
mod test {
492492
use super::*;
493493

494+
#[ignore]
494495
#[test_log::test]
495496
fn cached_checkout_dir_sanity() {
496497
let shader_template_path = crate::test::shader_crate_template_path();

0 commit comments

Comments
 (0)