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

tmandry · web-flow · commit 4bb91c784521 · 2019-10-29T12:01:41.000-07:00
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.
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")
 ))]

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,12 @@ pub fn get_concurrency() -> usize {`
`54`	`54`	`1`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ #[cfg(target_os = "hermit")]`
	`58`	`+ fn num_cpus() -> usize {`
	`59`	`+ // FIXME: Implement num_cpus on HermitCore`
	`60`	`+ 1`
	`61`	`+ }`
	`62`	`+`
`57`	`63`	`#[cfg(any(`
`58`	`64`	`all(target_arch = "wasm32", not(target_os = "emscripten")),`
`59`	`65`	`all(target_vendor = "fortanix", target_env = "sgx")`