Skip to content

Commit 6ba30cb

Browse files
Imberflurkvark
authored andcommitted
Run tests in the CI for all workspace members
1 parent ee3b859 commit 6ba30cb

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
if: matrix.kind == 'test'
139139
run: |
140140
cargo build --target ${{ matrix.target }} --bin wgpu-info
141-
cargo build --target ${{ matrix.target }} --tests -p player
141+
cargo build --target ${{ matrix.target }} --tests --workspace --exclude wgpu
142142
cargo build --target ${{ matrix.target }} --examples --tests -p wgpu
143143
144144
- name: tests
@@ -148,7 +148,7 @@ jobs:
148148
cargo run --target ${{ matrix.target }} --bin wgpu-info
149149
150150
# run player tests
151-
cargo test --target ${{ matrix.target }} -p player -- --nocapture
151+
cargo test --target ${{ matrix.target }} --workspace --exclude wpgu --no-fail-fast -- --nocapture
152152
153153
# run coretests
154154
cargo run --target ${{ matrix.target }} --bin wgpu-info -- cargo test --target ${{ matrix.target }} -p wgpu --no-fail-fast -- --nocapture --test-threads=1 # GLES is currently non-multithreadable

wgpu-core/src/macros.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,16 @@ fn test_backend_macro() {
8484
}
8585

8686
#[cfg(any(windows, all(unix, not(target_os = "ios"), not(target_os = "macos")),))]
87-
assert!(vec.contains(&(1, 'a')));
87+
assert!(vec.contains(&(101, 'a')));
8888

8989
#[cfg(any(target_os = "ios", target_os = "macos"))]
90-
assert!(vec.contains(&(2, 'b')));
90+
assert!(vec.contains(&(102, 'b')));
9191

9292
#[cfg(dx12)]
93-
assert!(vec.contains(&(3, 'c')));
93+
assert!(vec.contains(&(103, 'c')));
9494

9595
#[cfg(dx11)]
96-
assert!(vec.contains(&(4, 'd')));
96+
assert!(vec.contains(&(104, 'd')));
9797

9898
// test complex statement-per-backend
9999
backends_map! {
@@ -104,16 +104,16 @@ fn test_backend_macro() {
104104
};
105105

106106
#[cfg(vulkan)]
107-
map((test_foo.vulkan, |v| v == 1, || println!("vulkan"))),
107+
map((test_foo.vulkan, |v| v == 101, || println!("vulkan"))),
108108

109109
#[cfg(metal)]
110-
map((test_foo.metal, |v| v == 2, || println!("metal"))),
110+
map((test_foo.metal, |v| v == 102, || println!("metal"))),
111111

112112
#[cfg(dx12)]
113-
map((test_foo.dx12, |v| v == 3, || println!("dx12"))),
113+
map((test_foo.dx12, |v| v == 103, || println!("dx12"))),
114114

115115
#[cfg(dx11)]
116-
map((test_foo.dx11, |v| v == 4, || println!("dx11"))),
116+
map((test_foo.dx11, |v| v == 104, || println!("dx11"))),
117117
}
118118

119119
// test struct construction 2

0 commit comments

Comments
 (0)