diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-07-16 17:08:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 17:08:56 -0700 |
| commit | 41d956bf632fbc658f21a4195344fe79b685cde9 (patch) | |
| tree | 24b2fbdfb120b84814d6b1bd996e6dba940fd15e /src/libstd/thread | |
| parent | ec93d566b3ef29d5b97acca520558b5b05104f20 (diff) | |
| parent | 85c25aed510ce599504b172f7c7bef280e91637b (diff) | |
| download | rust-41d956bf632fbc658f21a4195344fe79b685cde9.tar.gz rust-41d956bf632fbc658f21a4195344fe79b685cde9.zip | |
Rollup merge of #73269 - mzohreva:mz/sgx-wait-timeout, r=jethrogb
Enable some timeouts in SGX platform This would partially resolve https://github.com/fortanix/rust-sgx/issues/31 cc @jethrogb and @Goirad
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/mod.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index d354a9b1842..202867258f1 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -1741,7 +1741,6 @@ mod tests { } #[test] - #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31 fn test_park_timeout_unpark_not_called() { for _ in 0..10 { thread::park_timeout(Duration::from_millis(10)); @@ -1749,7 +1748,6 @@ mod tests { } #[test] - #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31 fn test_park_timeout_unpark_called_other_thread() { for _ in 0..10 { let th = thread::current(); @@ -1764,7 +1762,6 @@ mod tests { } #[test] - #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31 fn sleep_ms_smoke() { thread::sleep(Duration::from_millis(2)); } |