Skip to content

Commit c1066fb

Browse files
committed
Test Library::pkg_config
1 parent 1edb6b1 commit c1066fb

File tree

2 files changed

+26
-12
lines changed

2 files changed

+26
-12
lines changed

.github/workflows/intel-mkl-tool.yml

+13-9
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,23 @@ jobs:
4646
- name: Test with mkl-rust container
4747
run: make -C intel-mkl-tool ${{ matrix.target }}
4848

49-
seek-opt-intel:
49+
find_system_mkl:
5050
runs-on: ubuntu-22.04
51+
strategy:
52+
fail-fast: false
53+
matrix:
54+
image: ["mkl-rust", "mkl-ubuntu", "mkl-centos"]
5155
container:
52-
image: ghcr.io/rust-math/intel-mkl-src/mkl-rust:1.56.0
56+
image: ghcr.io/rust-math/intel-mkl-src/${{ matrix.image }}:1.56.0
5357
steps:
5458
- uses: actions/checkout@v1
5559
- uses: actions-rs/cargo@v1
56-
name: cargo test seek_opt_intel
60+
name: Seek /opt/intel
61+
with:
62+
command: test
63+
args: --manifest-path=intel-mkl-tool/Cargo.toml seek_opt_intel -- --ignored --show-output
64+
- uses: actions-rs/cargo@v1
65+
name: Use pkg-config
5766
with:
5867
command: test
59-
args: >
60-
--manifest-path=intel-mkl-tool/Cargo.toml
61-
seek_opt_intel
62-
--
63-
--ignored
64-
--show-output
68+
args: --manifest-path=intel-mkl-tool/Cargo.toml pkg_config -- --ignored --show-output

intel-mkl-tool/src/entry.rs

+13-3
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,18 @@ mod tests {
432432
#[ignore]
433433
#[test]
434434
fn seek_opt_intel() {
435-
let cfg = Config::from_str("mkl-static-lp64-seq").unwrap();
436-
let lib = Library::seek_directory(cfg, "/opt/intel").unwrap();
437-
dbg!(lib);
435+
for cfg in Config::possibles() {
436+
let lib = Library::seek_directory(cfg, "/opt/intel").unwrap();
437+
dbg!(lib);
438+
}
439+
}
440+
441+
#[ignore]
442+
#[test]
443+
fn pkg_config() {
444+
for cfg in Config::possibles() {
445+
let lib = Library::pkg_config(cfg).unwrap();
446+
dbg!(lib);
447+
}
438448
}
439449
}

0 commit comments

Comments
 (0)