From b07d175388403e4d15a86fa4caddfdcef5106d71 Mon Sep 17 00:00:00 2001 From: Nicholas Baron Date: Tue, 20 Jul 2021 15:10:33 -0700 Subject: [PATCH 1/2] Disable glibc tests on vxworks VxWorks does not provide glibc, but we still need to test rustc on VxWorks. --- library/std/src/sys/unix/os/tests.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/std/src/sys/unix/os/tests.rs b/library/std/src/sys/unix/os/tests.rs index 0e1dcb390a07a..c445acf2722c0 100644 --- a/library/std/src/sys/unix/os/tests.rs +++ b/library/std/src/sys/unix/os/tests.rs @@ -1,12 +1,14 @@ use super::*; #[test] +#[cfg(not(target_os = "vxworks"))] fn test_glibc_version() { // This mostly just tests that the weak linkage doesn't panic wildly... glibc_version(); } #[test] +#[cfg(not(target_os = "vxworks"))] fn test_parse_glibc_version() { let cases = [ ("0.0", Some((0, 0))), From 7a9dd00506f496f511d87fda5a286813322f8e55 Mon Sep 17 00:00:00 2001 From: Nicholas Baron Date: Tue, 20 Jul 2021 15:12:36 -0700 Subject: [PATCH 2/2] VxWorks does provide sigemptyset and sigaddset --- library/std/src/sys/unix/process/process_common.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/std/src/sys/unix/process/process_common.rs b/library/std/src/sys/unix/process/process_common.rs index c5bdd1bda4a7a..f2f161e4eaa77 100644 --- a/library/std/src/sys/unix/process/process_common.rs +++ b/library/std/src/sys/unix/process/process_common.rs @@ -50,7 +50,7 @@ cfg_if::cfg_if! { raw[bit / 8] |= 1 << (bit % 8); return 0; } - } else if #[cfg(not(target_os = "vxworks"))] { + } else { pub use libc::{sigemptyset, sigaddset}; } }