user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
add basic HermitCore support within libtest

This an extension to #65167. The current pull request extend libtest to support HermitCore as target OS.
This commit is contained in:
Tyler Mandry 2019-10-29 12:01:41 -07:00 • committed by GitHub
commit 4bb91c7845
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libtest/helpers/concurrency.rs
View file

@ -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")

2
src/libtest/helpers/isatty.rs
View file

@ -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")
))]