Rollup merge of rust-lang#65898 - hermitcore:rusty-hermit, r=kennytm

add basic HermitCore support within libtest This an extension to rust-lang#65167. The current pull request extend libtest to support HermitCore as target OS.
tmandry · Oct 29, 2019 · 4bb91c7 · 4bb91c7
2 parents e15f1be + cf65200
commit 4bb91c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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")
 ))]