From 2518c2bb379bf0aa18d6c1d18a4bb4b8831ea41e Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Mon, 9 Sep 2019 16:47:55 +0200 Subject: [PATCH] Try fully enabling `emscripten` targets again. --- azure-pipelines.yml | 5 +++-- docker/{disabled => }/Dockerfile.asmjs-unknown-emscripten | 0 2 files changed, 3 insertions(+), 2 deletions(-) rename docker/{disabled => }/Dockerfile.asmjs-unknown-emscripten (100%) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3bbac16f2..3abc68e18 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -60,8 +60,9 @@ strategy: x86_64-unknown-netbsd: { TARGET: x86_64-unknown-netbsd, CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24 } sparcv9-sun-solaris: { TARGET: sparcv9-sun-solaris, CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24 } x86_64-sun-solaris: { TARGET: x86_64-sun-solaris, CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24 } - # asmjs-unknown-emscripten: { TARGET: asmjs-unknown-emscripten, CPP: 1, STD: 1, RUN: 1 } - wasm32-unknown-emscripten: { TARGET: wasm32-unknown-emscripten, STD: 1 } + asmjs-unknown-emscripten: { TARGET: asmjs-unknown-emscripten, CPP: 1, STD: 1, RUN: 1 } + # `cargo run` fails with an assertion error (https://github.com/rust-lang/cargo/issues/4689) on `wasm32-unknown-emscripten`. + wasm32-unknown-emscripten: { TARGET: wasm32-unknown-emscripten, CPP: 1, STD: 1 } thumbv6m-none-eabi: { TARGET: thumbv6m-none-eabi, STD: 1 } thumbv7em-none-eabi: { TARGET: thumbv7em-none-eabi, STD: 1 } thumbv7em-none-eabihf: { TARGET: thumbv7em-none-eabihf, STD: 1 } diff --git a/docker/disabled/Dockerfile.asmjs-unknown-emscripten b/docker/Dockerfile.asmjs-unknown-emscripten similarity index 100% rename from docker/disabled/Dockerfile.asmjs-unknown-emscripten rename to docker/Dockerfile.asmjs-unknown-emscripten