diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-07-27 19:31:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 19:31:55 +0900 |
| commit | ba3c245227a83e9470de17f777f967b4d20fd8f3 (patch) | |
| tree | 4c9011e433d5f11a08548c45ebfbff926ce46c75 /src/libstd | |
| parent | 1361b02c9fc9a96ab4baf82994a0f1b29beff41a (diff) | |
| parent | 141adeb4933bf3ffe1d4a69f51f6055765fdae86 (diff) | |
Rollup merge of #74598 - mzohreva:mz/fix-test, r=KodrAus
Fix sync_once_cell_does_not_leak_partially_constructed_boxes Spinning multiple threads in this test causes a deadlock in SGX where thread scheduling is not preemptive. cc @jethrogb @AdrianCX
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lazy.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/lazy.rs b/src/libstd/lazy.rs index 86e1cfae582..1705a4f77c5 100644 --- a/src/libstd/lazy.rs +++ b/src/libstd/lazy.rs @@ -827,6 +827,8 @@ mod tests { tx.send(msg).unwrap(); break; } + #[cfg(target_env = "sgx")] + crate::thread::yield_now(); } }); } |
