From ced52274a18e11e25d96836f149c149a7031a1cd Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Thu, 7 May 2020 18:07:44 -0600 Subject: [PATCH] Skip the OFD lock tests on musl OVERLAYFS_SUPER_MAGIC isn't defined on musl, at least not yet --- Cargo.toml | 2 +- test/test_fcntl.rs | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0079ca889f..56f1698626 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ exclude = [ ] [dependencies] -libc = { git = "https://github.com/asomers/libc/", rev = "6f3ffc9bf8d2f4a8569db765c4b0623e90c8babf", features = [ "extra_traits" ] } +libc = { git = "https://github.com/asomers/libc/", rev = "1528ff12559b4902923f7ae253756f754b81ccb9", features = [ "extra_traits" ] } bitflags = "1.1" cfg-if = "0.1.10" diff --git a/test/test_fcntl.rs b/test/test_fcntl.rs index 324451f42f..2971907224 100644 --- a/test/test_fcntl.rs +++ b/test/test_fcntl.rs @@ -228,7 +228,8 @@ mod linux_android { target_arch = "mips64", target_arch = "mips64el", target_arch = "powerpc64", - target_arch = "powerpc64le")))] + target_arch = "powerpc64le", + target_env = "musl")))] fn test_ofd_write_lock() { let tmp = NamedTempFile::new().unwrap(); @@ -269,7 +270,8 @@ mod linux_android { target_arch = "mips64", target_arch = "mips64el", target_arch = "powerpc64", - target_arch = "powerpc64le")))] + target_arch = "powerpc64le", + target_env = "musl")))] fn test_ofd_read_lock() { let tmp = NamedTempFile::new().unwrap();