diff options
| author | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2025-09-09 13:04:24 +0200 |
|---|---|---|
| committer | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2025-09-15 11:07:16 +0200 |
| commit | bab9ed40c689be1c2b3f082babb7e6bd0da662d2 (patch) | |
| tree | 3d909132f7e1efbf6f7bd7b632be93d85b1ea502 /test | |
| parent | e7e41250e6543b3d67e6c86d8194d401790d4905 (diff) | |
| download | mullvadvpn-bab9ed40c689be1c2b3f082babb7e6bd0da662d2.tar.xz mullvadvpn-bab9ed40c689be1c2b3f082babb7e6bd0da662d2.zip | |
Allow test-runner to be built against musl
Diffstat (limited to 'test')
| -rw-r--r-- | test/Cargo.lock | 10 | ||||
| -rw-r--r-- | test/test-manager/Cargo.toml | 2 | ||||
| -rw-r--r-- | test/test-runner/src/net.rs | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/test/Cargo.lock b/test/Cargo.lock index fe46d24b8c..8552fc8486 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -2379,6 +2379,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] +name = "openssl-src" +version = "300.5.2+3.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d270b79e2926f5150189d475bc7e9d2c69f9c4697b185fa917d5a32b792d21b4" +dependencies = [ + "cc", +] + +[[package]] name = "openssl-sys" version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2386,6 +2395,7 @@ checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/test/test-manager/Cargo.toml b/test/test-manager/Cargo.toml index 2225f46ad9..0d976dd136 100644 --- a/test/test-manager/Cargo.toml +++ b/test/test-manager/Cargo.toml @@ -61,7 +61,7 @@ mullvad-types = { path = "../../mullvad-types" } mullvad-version = { path = "../../mullvad-version" } talpid-types = { path = "../../talpid-types" } -ssh2 = "0.9.5" +ssh2 = { version = "0.9.5", features = ["vendored-openssl"] } nix = { workspace = true } socket2 = { workspace = true } diff --git a/test/test-runner/src/net.rs b/test/test-runner/src/net.rs index 967d3c8c32..fe100f22c7 100644 --- a/test/test-runner/src/net.rs +++ b/test/test-runner/src/net.rs @@ -308,7 +308,7 @@ pub fn get_interface_mtu(interface_name: &str) -> Result<u16, test_rpc::Error> { // TODO: define SIOCGIFMTU for macos // SAFETY: SIOCGIFMTU expects an ifreq, and the socket is valid - if unsafe { libc::ioctl(sock.as_raw_fd(), libc::SIOCGIFMTU, &mut ifr) } < 0 { + if unsafe { libc::ioctl(sock.as_raw_fd(), libc::SIOCGIFMTU as libc::Ioctl, &mut ifr) } < 0 { let e = std::io::Error::last_os_error(); log::error!("{}", e); |