summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryant Mairs <bryant@mai.rs>2017-07-09 13:19:41 -0700
committerMarcin Mielniczuk <marmistrz.dev@zoho.eu>2017-07-25 09:09:52 +0200
commita7170033961fc27721f242ef27c2c2b76d4d943e (patch)
treeab334c0b4ea42788224ed071f53ad4bcc98fc915
parent46191fdbd8c26009dbd8889a6a3495643e5379a4 (diff)
downloadnix-a7170033961fc27721f242ef27c2c2b76d4d943e.zip
Disable failing tests on mips64
These are assumed to be QEMU issues, as they also fail on mips.
-rw-r--r--README.md4
-rw-r--r--test/sys/test_aio.rs6
-rw-r--r--test/sys/test_ioctl.rs10
-rw-r--r--test/test_mq.rs4
4 files changed, 12 insertions, 12 deletions
diff --git a/README.md b/README.md
index e83e6ffa..3fd19a92 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,8 @@ Tier 1:
* i686-unknown-linux-gnu
* i686-unknown-linux-musl
* mips-unknown-linux-gnu
+ * mips64-unknown-linux-gnuabi64
+ * mips64el-unknown-linux-gnuabi64
* mipsel-unknown-linux-gnu
* powerpc64-unknown-linux-gnu
* powerpc64le-unknown-linux-gnu
@@ -76,8 +78,6 @@ Tier 2:
* i386-apple-ios
* i686-linux-android (requires Rust >= 1.18)
* i686-unknown-freebsd
- * mips64-unknown-linux-gnuabi64
- * mips64el-unknown-linux-gnuabi64
* powerpc-unknown-linux-gnu
* s390x-unknown-linux-gnu
* x86_64-apple-ios
diff --git a/test/sys/test_aio.rs b/test/sys/test_aio.rs
index 54ee5a96..e4b48b8d 100644
--- a/test/sys/test_aio.rs
+++ b/test/sys/test_aio.rs
@@ -241,7 +241,7 @@ extern fn sigfunc(_: c_int) {
// Test an aio operation with completion delivered by a signal
// FIXME: This test is ignored on mips because of failures in qemu in CI
#[test]
-#[cfg_attr(any(all(target_env = "musl", target_arch = "x86_64"), target_arch = "mips"), ignore)]
+#[cfg_attr(any(all(target_env = "musl", target_arch = "x86_64"), target_arch = "mips", target_arch = "mips64"), ignore)]
fn test_write_sigev_signal() {
#[allow(unused_variables)]
let m = ::SIGNAL_MTX.lock().expect("Mutex got poisoned by another test");
@@ -369,10 +369,10 @@ fn test_lio_listio_nowait() {
// Test lio_listio with LIO_NOWAIT and a SigEvent to indicate when all AioCb's
// are complete.
-// FIXME: This test is ignored on mips because of failures in qemu in CI.
+// FIXME: This test is ignored on mips/mips64 because of failures in qemu in CI.
#[test]
#[cfg(not(any(target_os = "ios", target_os = "macos")))]
-#[cfg_attr(any(target_arch = "mips", target_env = "musl"), ignore)]
+#[cfg_attr(any(target_arch = "mips", target_arch = "mips64", target_env = "musl"), ignore)]
fn test_lio_listio_signal() {
#[allow(unused_variables)]
let m = ::SIGNAL_MTX.lock().expect("Mutex got poisoned by another test");
diff --git a/test/sys/test_ioctl.rs b/test/sys/test_ioctl.rs
index bd275a97..1b9e464b 100644
--- a/test/sys/test_ioctl.rs
+++ b/test/sys/test_ioctl.rs
@@ -86,7 +86,7 @@ ioctl! {
mod linux {
#[test]
fn test_op_none() {
- if cfg!(any(target_arch = "mips", target_arch="powerpc", target_arch="powerpc64")){
+ if cfg!(any(target_arch = "mips", target_arch = "mips64", target_arch="powerpc", target_arch="powerpc64")){
assert_eq!(io!(b'q', 10), 0x2000710A);
assert_eq!(io!(b'a', 255), 0x200061FF);
} else {
@@ -97,7 +97,7 @@ mod linux {
#[test]
fn test_op_write() {
- if cfg!(any(target_arch = "mips", target_arch="powerpc", target_arch="powerpc64")){
+ if cfg!(any(target_arch = "mips", target_arch = "mips64", target_arch="powerpc", target_arch="powerpc64")){
assert_eq!(iow!(b'z', 10, 1), 0x80017A0A);
assert_eq!(iow!(b'z', 10, 512), 0x82007A0A);
} else {
@@ -109,7 +109,7 @@ mod linux {
#[cfg(target_pointer_width = "64")]
#[test]
fn test_op_write_64() {
- if cfg!(any(target_arch="powerpc64")){
+ if cfg!(any(target_arch = "mips64", target_arch="powerpc64")){
assert_eq!(iow!(b'z', 10, (1 as u64) << 32), 0x80007A0A);
} else {
assert_eq!(iow!(b'z', 10, (1 as u64) << 32), 0x40007A0A);
@@ -119,7 +119,7 @@ mod linux {
#[test]
fn test_op_read() {
- if cfg!(any(target_arch = "mips", target_arch="powerpc", target_arch="powerpc64")){
+ if cfg!(any(target_arch = "mips", target_arch = "mips64", target_arch="powerpc", target_arch="powerpc64")){
assert_eq!(ior!(b'z', 10, 1), 0x40017A0A);
assert_eq!(ior!(b'z', 10, 512), 0x42007A0A);
} else {
@@ -131,7 +131,7 @@ mod linux {
#[cfg(target_pointer_width = "64")]
#[test]
fn test_op_read_64() {
- if cfg!(any(target_arch="powerpc64")){
+ if cfg!(any(target_arch = "mips64", target_arch="powerpc64")){
assert_eq!(ior!(b'z', 10, (1 as u64) << 32), 0x40007A0A);
} else {
assert_eq!(ior!(b'z', 10, (1 as u64) << 32), 0x80007A0A);
diff --git a/test/test_mq.rs b/test/test_mq.rs
index 08edef78..39e6b62a 100644
--- a/test/test_mq.rs
+++ b/test/test_mq.rs
@@ -50,7 +50,7 @@ fn test_mq_getattr() {
// FIXME: Fix failures for mips in QEMU
#[test]
-#[cfg_attr(target_arch = "mips", ignore)]
+#[cfg_attr(any(target_arch = "mips", target_arch = "mips64"), ignore)]
fn test_mq_setattr() {
const MSG_SIZE: c_long = 32;
let initial_attr = MqAttr::new(0, 10, MSG_SIZE, 0);
@@ -78,7 +78,7 @@ fn test_mq_setattr() {
// FIXME: Fix failures for mips in QEMU
#[test]
-#[cfg_attr(target_arch = "mips", ignore)]
+#[cfg_attr(any(target_arch = "mips", target_arch = "mips64"), ignore)]
fn test_mq_set_nonblocking() {
const MSG_SIZE: c_long = 32;
let initial_attr = MqAttr::new(0, 10, MSG_SIZE, 0);