Skip to content

Commit c0db54c

Browse files
committed
test: Run tests in ZIG_COMMAND=zig environment
Test the new `zig dlltool` command functionality. Update unit tests to use the new builder API.
1 parent 15ee9db commit c0db54c

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

.github/workflows/rust.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,21 @@ jobs:
2222
- uses: actions/checkout@v3
2323
- name: Install the MinGW and LLVM toolchains
2424
if: matrix.os == 'ubuntu-latest'
25-
run: sudo apt-get install -y mingw-w64 llvm
25+
run: sudo apt-get install -y gcc-mingw-w64 llvm
2626
- name: Build
2727
run: cargo build --verbose
2828
- name: Run tests
2929
run: cargo test --verbose
30+
zigbuild:
31+
name: Test zig dlltool
32+
runs-on: ubuntu-latest
33+
steps:
34+
- uses: actions/checkout@v3
35+
- uses: goto-bus-stop/setup-zig@v1
36+
with:
37+
version: 0.9.1
38+
- name: Run tests with zig
39+
run: ZIG_COMMAND=zig cargo test --verbose
3040
fmt:
3141
name: Check code formatting
3242
runs-on: ubuntu-latest

src/lib.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,10 @@ mod tests {
421421
dir.push("x86_64-pc-windows-gnu");
422422
dir.push("python3-dll");
423423

424+
ImportLibraryGenerator::new("x86_64", "gnu")
425+
.generate(&dir)
426+
.unwrap();
427+
424428
for minor in 7..=11 {
425429
ImportLibraryGenerator::new("x86_64", "gnu")
426430
.version(Some((3, minor)))
@@ -447,7 +451,10 @@ mod tests {
447451
dir.push("x86_64-pc-windows-msvc");
448452
dir.push("python3-dll");
449453

450-
generate_implib_for_target(&dir, "x86_64", "msvc").unwrap();
454+
ImportLibraryGenerator::new("x86_64", "msvc")
455+
.generate(&dir)
456+
.unwrap();
457+
451458
for minor in 7..=11 {
452459
ImportLibraryGenerator::new("x86_64", "msvc")
453460
.version(Some((3, minor)))

0 commit comments

Comments
 (0)