Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/test-various/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v44.0
tar -xJ
ENV PATH="$PATH:/wasmtime-v44.0.1-x86_64-linux"

ENV WASM_WASIP_TARGET=wasm32-wasip1
ENV WASM_WASIP_SCRIPT="python3 /checkout/x.py --stage 2 test --host= --target $WASM_WASIP_TARGET \
ENV WASM_WASIP_TARGETS=wasm32-wasip1,,wasm32-wasip2,,wasm32-wasip3
ENV WASM_WASIP_SCRIPT="python3 /checkout/x.py --stage 2 test --host= --target $WASM_WASIP_TARGETS \
tests/run-make \
tests/run-make-cargo \
tests/ui \
Expand Down
2 changes: 2 additions & 0 deletions src/tools/compiletest/src/directives/directive_names.rs
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,8 @@ pub(crate) const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
"only-wasm32-unknown-emscripten",
"only-wasm32-unknown-unknown",
"only-wasm32-wasip1",
"only-wasm32-wasip2",
"only-wasm32-wasip3",
"only-watchos",
"only-windows",
"only-windows-gnu",
Expand Down
3 changes: 3 additions & 0 deletions tests/run-make/wasm-wasip1-exit-code/exit-code.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fn main() {
std::process::exit(42);
}
8 changes: 8 additions & 0 deletions tests/run-make/wasm-wasip1-exit-code/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//@ only-wasm32-wasip1

use run_make_support::{run_fail, rustc};

fn main() {
rustc().arg("exit-code.rs").run();
run_fail("exit-code.wasm").assert_exit_code(42);
}
3 changes: 3 additions & 0 deletions tests/run-make/wasm-wasip2-exit-code/exit-code.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fn main() {
std::process::exit(42);
}
8 changes: 8 additions & 0 deletions tests/run-make/wasm-wasip2-exit-code/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//@ only-wasm32-wasip2

use run_make_support::{run_fail, rustc};

fn main() {
rustc().arg("exit-code.rs").run();
run_fail("exit-code.wasm").assert_exit_code(42);
}
3 changes: 3 additions & 0 deletions tests/run-make/wasm-wasip3-exit-code/exit-code.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fn main() {
std::process::exit(42);
}
8 changes: 8 additions & 0 deletions tests/run-make/wasm-wasip3-exit-code/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//@ only-wasm32-wasip3

use run_make_support::{run_fail, rustc};

fn main() {
rustc().arg("exit-code.rs").run();
run_fail("exit-code.wasm").assert_exit_code(42);
}
Loading