about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2020-06-20 16:39:51 +0200
committerGitHub <noreply@github.com>2020-06-20 16:39:51 +0200
commit77efcab0f2badb39ba4605ae40337e7bda51fa81 (patch)
tree853d57f0605ba9d5311d2985532f8eadd9a38df7 /src/libstd
parent913aac8ac2c1037184f87948259eefa9530f1df3 (diff)
parent086eaf8f69b736a7f4b6b8ee232540993d0c255d (diff)
downloadrust-77efcab0f2badb39ba4605ae40337e7bda51fa81.tar.gz
rust-77efcab0f2badb39ba4605ae40337e7bda51fa81.zip
Rollup merge of #73171 - tblah:riscv-qemu-test, r=pietroalbini
RISC-V Emulated Testing

Adds a disabled docker image on which to run RISC-V tests. Based on the armhf image.

Test using
```
./src/ci/docker/run.sh riscv64gc-linux
```

cc: @msizanoen1
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sys/unix/process/process_common.rs1
-rw-r--r--src/libstd/time.rs4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/process/process_common.rs b/src/libstd/sys/unix/process/process_common.rs
index 2d7267263de..6e33cdd3c48 100644
--- a/src/libstd/sys/unix/process/process_common.rs
+++ b/src/libstd/sys/unix/process/process_common.rs
@@ -428,6 +428,7 @@ mod tests {
     // ignored there.
     #[cfg_attr(target_arch = "arm", ignore)]
     #[cfg_attr(target_arch = "aarch64", ignore)]
+    #[cfg_attr(target_arch = "riscv64", ignore)]
     fn test_process_mask() {
         unsafe {
             // Test to make sure that a signal mask does not get inherited.
diff --git a/src/libstd/time.rs b/src/libstd/time.rs
index 295ebcbb729..84fa35e01bb 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -811,11 +811,11 @@ mod tests {
 
         // Right now for CI this test is run in an emulator, and apparently the
         // aarch64 emulator's sense of time is that we're still living in the
-        // 70s.
+        // 70s. This is also true for riscv (also qemu)
         //
         // Otherwise let's assume that we're all running computers later than
         // 2000.
-        if !cfg!(target_arch = "aarch64") {
+        if !cfg!(target_arch = "aarch64") && !cfg!(target_arch = "riscv64") {
             assert!(a > thirty_years);
         }