Skip to content

Commit ceab572

Browse files
committed
Disable failing tests on mips64
These are assumed to be QEMU issues, as they also fail on mips.
1 parent 52ceafd commit ceab572

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ Tier 1:
5757
* i686-unknown-linux-gnu
5858
* i686-unknown-linux-musl
5959
* mips-unknown-linux-gnu
60+
* mips64-unknown-linux-gnuabi64
61+
* mips64el-unknown-linux-gnuabi64
6062
* mipsel-unknown-linux-gnu
6163
* powerpc64-unknown-linux-gnu
6264
* powerpc64le-unknown-linux-gnu
@@ -76,8 +78,6 @@ Tier 2:
7678
* i386-apple-ios
7779
* i686-linux-android (requires Rust >= 1.18)
7880
* i686-unknown-freebsd
79-
* mips64-unknown-linux-gnuabi64
80-
* mips64el-unknown-linux-gnuabi64
8181
* powerpc-unknown-linux-gnu
8282
* s390x-unknown-linux-gnu
8383
* x86_64-apple-ios

test/sys/test_aio.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ extern fn sigfunc(_: c_int) {
241241
// Test an aio operation with completion delivered by a signal
242242
// FIXME: This test is ignored on mips because of failures in qemu in CI
243243
#[test]
244-
#[cfg_attr(any(all(target_env = "musl", target_arch = "x86_64"), target_arch = "mips"), ignore)]
244+
#[cfg_attr(any(all(target_env = "musl", target_arch = "x86_64"), target_arch = "mips", target_arch = "mips64"), ignore)]
245245
fn test_write_sigev_signal() {
246246
#[allow(unused_variables)]
247247
let m = ::SIGNAL_MTX.lock().expect("Mutex got poisoned by another test");
@@ -369,10 +369,10 @@ fn test_lio_listio_nowait() {
369369

370370
// Test lio_listio with LIO_NOWAIT and a SigEvent to indicate when all AioCb's
371371
// are complete.
372-
// FIXME: This test is ignored on mips because of failures in qemu in CI.
372+
// FIXME: This test is ignored on mips/mips64 because of failures in qemu in CI.
373373
#[test]
374374
#[cfg(not(any(target_os = "ios", target_os = "macos")))]
375-
#[cfg_attr(any(target_arch = "mips", target_env = "musl"), ignore)]
375+
#[cfg_attr(any(target_arch = "mips", target_arch = "mips64", target_env = "musl"), ignore)]
376376
fn test_lio_listio_signal() {
377377
#[allow(unused_variables)]
378378
let m = ::SIGNAL_MTX.lock().expect("Mutex got poisoned by another test");

test/sys/test_ioctl.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ ioctl! {
8686
mod linux {
8787
#[test]
8888
fn test_op_none() {
89-
if cfg!(any(target_arch = "mips", target_arch="powerpc", target_arch="powerpc64")){
89+
if cfg!(any(target_arch = "mips", target_arch = "mips64", target_arch="powerpc", target_arch="powerpc64")){
9090
assert_eq!(io!(b'q', 10), 0x2000710A);
9191
assert_eq!(io!(b'a', 255), 0x200061FF);
9292
} else {
@@ -97,7 +97,7 @@ mod linux {
9797

9898
#[test]
9999
fn test_op_write() {
100-
if cfg!(any(target_arch = "mips", target_arch="powerpc", target_arch="powerpc64")){
100+
if cfg!(any(target_arch = "mips", target_arch = "mips64", target_arch="powerpc", target_arch="powerpc64")){
101101
assert_eq!(iow!(b'z', 10, 1), 0x80017A0A);
102102
assert_eq!(iow!(b'z', 10, 512), 0x82007A0A);
103103
} else {
@@ -109,7 +109,7 @@ mod linux {
109109
#[cfg(target_pointer_width = "64")]
110110
#[test]
111111
fn test_op_write_64() {
112-
if cfg!(any(target_arch="powerpc64")){
112+
if cfg!(any(target_arch = "mips64", target_arch="powerpc64")){
113113
assert_eq!(iow!(b'z', 10, (1 as u64) << 32), 0x80007A0A);
114114
} else {
115115
assert_eq!(iow!(b'z', 10, (1 as u64) << 32), 0x40007A0A);
@@ -119,7 +119,7 @@ mod linux {
119119

120120
#[test]
121121
fn test_op_read() {
122-
if cfg!(any(target_arch = "mips", target_arch="powerpc", target_arch="powerpc64")){
122+
if cfg!(any(target_arch = "mips", target_arch = "mips64", target_arch="powerpc", target_arch="powerpc64")){
123123
assert_eq!(ior!(b'z', 10, 1), 0x40017A0A);
124124
assert_eq!(ior!(b'z', 10, 512), 0x42007A0A);
125125
} else {
@@ -131,7 +131,7 @@ mod linux {
131131
#[cfg(target_pointer_width = "64")]
132132
#[test]
133133
fn test_op_read_64() {
134-
if cfg!(any(target_arch="powerpc64")){
134+
if cfg!(any(target_arch = "mips64", target_arch="powerpc64")){
135135
assert_eq!(ior!(b'z', 10, (1 as u64) << 32), 0x40007A0A);
136136
} else {
137137
assert_eq!(ior!(b'z', 10, (1 as u64) << 32), 0x80007A0A);

test/test_mq.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn test_mq_getattr() {
5050

5151
// FIXME: Fix failures for mips in QEMU
5252
#[test]
53-
#[cfg_attr(target_arch = "mips", ignore)]
53+
#[cfg_attr(any(target_arch = "mips", target_arch = "mips64"), ignore)]
5454
fn test_mq_setattr() {
5555
const MSG_SIZE: c_long = 32;
5656
let initial_attr = MqAttr::new(0, 10, MSG_SIZE, 0);
@@ -78,7 +78,7 @@ fn test_mq_setattr() {
7878

7979
// FIXME: Fix failures for mips in QEMU
8080
#[test]
81-
#[cfg_attr(target_arch = "mips", ignore)]
81+
#[cfg_attr(any(target_arch = "mips", target_arch = "mips64"), ignore)]
8282
fn test_mq_set_nonblocking() {
8383
const MSG_SIZE: c_long = 32;
8484
let initial_attr = MqAttr::new(0, 10, MSG_SIZE, 0);

0 commit comments

Comments
 (0)