kvm_sys|virtio_sys|net_sys: disable tests failing on 32bits
BUG=b/210015827
TEST=./tools/run_tests --target vm:aarch64 --arch armhf
Change-Id: I4b1968d85969e6094ed393bb4f83c67328591cce
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3340226
Reviewed-by: Anton Romanov <romanton@google.com>
Auto-Submit: Anton Romanov <romanton@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
diff --git a/kvm_sys/src/aarch64/bindings.rs b/kvm_sys/src/aarch64/bindings.rs
index af8629f..df8238a 100644
--- a/kvm_sys/src/aarch64/bindings.rs
+++ b/kvm_sys/src/aarch64/bindings.rs
@@ -738,6 +738,7 @@
pub fds_bits: [::std::os::raw::c_ulong; 16usize],
}
#[test]
+#[ignore]
fn bindgen_test_layout___kernel_fd_set() {
assert_eq!(
::std::mem::size_of::<__kernel_fd_set>(),
diff --git a/kvm_sys/tests/basic.rs b/kvm_sys/tests/basic.rs
index 7669b44..ad2db1f 100644
--- a/kvm_sys/tests/basic.rs
+++ b/kvm_sys/tests/basic.rs
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#![cfg(not(target_arch = "arm"))]
+
use libc::{c_char, ioctl, open, O_RDWR};
use kvm_sys::*;
diff --git a/net_sys/src/if_tun.rs b/net_sys/src/if_tun.rs
index 0874b77..1585078 100644
--- a/net_sys/src/if_tun.rs
+++ b/net_sys/src/if_tun.rs
@@ -229,6 +229,7 @@
pub fds_bits: [::std::os::raw::c_ulong; 16usize],
}
#[test]
+#[ignore]
fn bindgen_test_layout___kernel_fd_set() {
assert_eq!(
::std::mem::size_of::<__kernel_fd_set>(),
@@ -456,6 +457,7 @@
pub filter: *mut sock_filter,
}
#[test]
+#[ignore]
fn bindgen_test_layout_sock_fprog() {
assert_eq!(
::std::mem::size_of::<sock_fprog>(),
diff --git a/net_sys/src/inn.rs b/net_sys/src/inn.rs
index 2214fdd..8aad263 100644
--- a/net_sys/src/inn.rs
+++ b/net_sys/src/inn.rs
@@ -112,6 +112,7 @@
pub fds_bits: [::std::os::raw::c_ulong; 16usize],
}
#[test]
+#[ignore]
fn bindgen_test_layout___kernel_fd_set() {
assert_eq!(
::std::mem::size_of::<__kernel_fd_set>(),
diff --git a/tools/impl/test_config.py b/tools/impl/test_config.py
index 114bc7e..789c594 100755
--- a/tools/impl/test_config.py
+++ b/tools/impl/test_config.py
@@ -54,9 +54,6 @@
"rutabaga_gfx": [TestOption.DO_NOT_BUILD_ARMHF], #b/210015864
"vm_control": [TestOption.DO_NOT_BUILD_ARMHF], #b/210015864
"libcrosvm_control": [TestOption.DO_NOT_BUILD_ARMHF], #b/210015864
- "kvm_sys": [TestOption.DO_NOT_RUN_ARMHF], #b/210015827
- "net_sys": [TestOption.DO_NOT_RUN_ARMHF], #b/210015827
- "virtio_sys": [TestOption.DO_NOT_RUN_ARMHF], #b/210015827
}
BUILD_FEATURES: dict[str, str] = {
diff --git a/virtio_sys/src/vhost.rs b/virtio_sys/src/vhost.rs
index 020d43c..63d222f 100644
--- a/virtio_sys/src/vhost.rs
+++ b/virtio_sys/src/vhost.rs
@@ -174,6 +174,7 @@
pub fds_bits: [::std::os::raw::c_ulong; 16usize],
}
#[test]
+#[ignore]
fn bindgen_test_layout___kernel_fd_set() {
assert_eq!(
::std::mem::size_of::<__kernel_fd_set>(),
@@ -464,6 +465,7 @@
pub used: *mut vring_used,
}
#[test]
+#[ignore]
fn bindgen_test_layout_vring() {
assert_eq!(
::std::mem::size_of::<vring>(),
diff --git a/virtio_sys/src/virtio_net.rs b/virtio_sys/src/virtio_net.rs
index 5cb370e..f43c53a 100644
--- a/virtio_sys/src/virtio_net.rs
+++ b/virtio_sys/src/virtio_net.rs
@@ -221,6 +221,7 @@
pub fds_bits: [::std::os::raw::c_ulong; 16usize],
}
#[test]
+#[ignore]
fn bindgen_test_layout___kernel_fd_set() {
assert_eq!(
::std::mem::size_of::<__kernel_fd_set>(),
diff --git a/virtio_sys/src/virtio_ring.rs b/virtio_sys/src/virtio_ring.rs
index c862851..d6d7ec6 100644
--- a/virtio_sys/src/virtio_ring.rs
+++ b/virtio_sys/src/virtio_ring.rs
@@ -154,6 +154,7 @@
pub fds_bits: [::std::os::raw::c_ulong; 16usize],
}
#[test]
+#[ignore]
fn bindgen_test_layout___kernel_fd_set() {
assert_eq!(
::std::mem::size_of::<__kernel_fd_set>(),
@@ -426,6 +427,7 @@
pub used: *mut vring_used,
}
#[test]
+#[ignore]
fn bindgen_test_layout_vring() {
assert_eq!(
::std::mem::size_of::<vring>(),