From 7cecfab386279ff626da7ee62fc6127b4093b69b Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Mon, 28 Oct 2019 09:54:24 -0400 Subject: [PATCH 1/2] add basic HermitCore support within libtest --- src/libtest/helpers/concurrency.rs | 6 ++++++ src/libtest/helpers/isatty.rs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libtest/helpers/concurrency.rs b/src/libtest/helpers/concurrency.rs index 61651a927c5f7..4fec01d752502 100644 --- a/src/libtest/helpers/concurrency.rs +++ b/src/libtest/helpers/concurrency.rs @@ -54,6 +54,12 @@ pub fn get_concurrency() -> usize { 1 } + #[cfg(target_os = "hermit")] + fn num_cpus() -> usize { + // FIXME: Implement num_cpus on HermitCore + 1 + } + #[cfg(any( all(target_arch = "wasm32", not(target_os = "emscripten")), all(target_vendor = "fortanix", target_env = "sgx") diff --git a/src/libtest/helpers/isatty.rs b/src/libtest/helpers/isatty.rs index 6e4954778e605..4955e1fc88862 100644 --- a/src/libtest/helpers/isatty.rs +++ b/src/libtest/helpers/isatty.rs @@ -2,7 +2,7 @@ //! if stdout is a tty. #[cfg(any( - target_os = "cloudabi", + target_os = "cloudabi", target_os = "hermit", all(target_arch = "wasm32", not(target_os = "emscripten")), all(target_vendor = "fortanix", target_env = "sgx") ))] From cf65200e5c78c04a7d9f05c4d8131218624a7924 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Mon, 28 Oct 2019 14:03:53 -0400 Subject: [PATCH 2/2] removing trailing whitespaces --- src/libtest/helpers/concurrency.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtest/helpers/concurrency.rs b/src/libtest/helpers/concurrency.rs index 4fec01d752502..6b0c8a8af32b4 100644 --- a/src/libtest/helpers/concurrency.rs +++ b/src/libtest/helpers/concurrency.rs @@ -57,7 +57,7 @@ pub fn get_concurrency() -> usize { #[cfg(target_os = "hermit")] fn num_cpus() -> usize { // FIXME: Implement num_cpus on HermitCore - 1 + 1 } #[cfg(any(