nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 08:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade wasm32 image to Ubuntu 20.04

Browse Source 
This switches the wasm32 image, which is used to test
wasm32-unknown-emscripten to Ubuntu 20.04. While at it, enable
most of the excluded tests, as they seem to work fine with some
minor fixes.
This commit is contained in:
Nikita Popov 2021-02-05 15:52:49 +01:00
parent 6ad11e2e25
commit 55e237284f
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/std/src/lazy/tests.rs
View File

@ -48,6 +48,7 @@ fn spawn_and_wait<R: Send + 'static>(f: impl FnOnce() -> R + Send + 'static) ->
} }
#[test] #[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn sync_once_cell() { fn sync_once_cell() {
static ONCE_CELL: SyncOnceCell<i32> = SyncOnceCell::new(); static ONCE_CELL: SyncOnceCell<i32> = SyncOnceCell::new();
@ -81,6 +82,7 @@ fn sync_once_cell_get_unchecked() {
} }
#[test] #[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn sync_once_cell_drop() { fn sync_once_cell_drop() {
static DROP_CNT: AtomicUsize = AtomicUsize::new(0); static DROP_CNT: AtomicUsize = AtomicUsize::new(0);
struct Dropper; struct Dropper;
@ -158,6 +160,7 @@ fn into_inner() {
} }
#[test] #[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn sync_lazy_new() { fn sync_lazy_new() {
static CALLED: AtomicUsize = AtomicUsize::new(0); static CALLED: AtomicUsize = AtomicUsize::new(0);
static SYNC_LAZY: SyncLazy<i32> = SyncLazy::new(|| { static SYNC_LAZY: SyncLazy<i32> = SyncLazy::new(|| {
@ -204,6 +207,7 @@ fn sync_lazy_default() {
} }
#[test] #[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn static_sync_lazy() { fn static_sync_lazy() {
static XS: SyncLazy<Vec<i32>> = SyncLazy::new(|| { static XS: SyncLazy<Vec<i32>> = SyncLazy::new(|| {
let mut xs = Vec::new(); let mut xs = Vec::new();
@ -279,6 +283,7 @@ fn eval_once_macro() {
} }
#[test] #[test]
#[cfg_attr(target_os = "emscripten", ignore)]
fn sync_once_cell_does_not_leak_partially_constructed_boxes() { fn sync_once_cell_does_not_leak_partially_constructed_boxes() {
static ONCE_CELL: SyncOnceCell<String> = SyncOnceCell::new(); static ONCE_CELL: SyncOnceCell<String> = SyncOnceCell::new();

2
library/test/src/tests.rs
View File

@ -27,7 +27,6 @@ use crate::{
}, },
time::{TestTimeOptions, TimeThreshold}, time::{TestTimeOptions, TimeThreshold},
}; };
use std::any::TypeId;
use std::sync::mpsc::channel; use std::sync::mpsc::channel;
use std::time::Duration; use std::time::Duration;
@ -198,6 +197,7 @@ fn test_should_panic_bad_message() {
#[cfg(not(target_os = "emscripten"))] #[cfg(not(target_os = "emscripten"))]
fn test_should_panic_non_string_message_type() { fn test_should_panic_non_string_message_type() {
use crate::tests::TrFailedMsg; use crate::tests::TrFailedMsg;
use std::any::TypeId;
fn f() { fn f() {
panic!(1i32); panic!(1i32);
} }

14
src/ci/docker/host-x86_64/wasm32/Dockerfile
View File

@ -1,6 +1,6 @@
FROM ubuntu:16.04 FROM ubuntu:20.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
g++ \ g++ \
make \ make \
ninja-build \ ninja-build \
@ -51,12 +51,6 @@ ENV EMCC_CFLAGS=-O1
# Emscripten installation is user-specific # Emscripten installation is user-specific
ENV NO_CHANGE_USER=1 ENV NO_CHANGE_USER=1
# FIXME: Re-enable these tests once https://github.com/rust-lang/cargo/pull/7476 # Exclude library/alloc due to OOM in benches.
# is picked up by CI
ENV SCRIPT python3 ../x.py test --stage 2 --host='' --target $TARGETS \ ENV SCRIPT python3 ../x.py test --stage 2 --host='' --target $TARGETS \
--exclude library/core \ --exclude library/alloc
--exclude library/alloc \
--exclude library/proc_macro \
--exclude library/std \
--exclude library/term \
--exclude library/test