Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Run s390x CI on a native machine (#11711)

Alex Crichton62d9b187ea66
diff --git a/.github/actions/install-rust/action.yml b/.github/actions/install-rust/action.yml
index e292d8afab..68f01e1e2e 100644
--- a/.github/actions/install-rust/action.yml
+++ b/.github/actions/install-rust/action.yml
@@ -37,6 +37,26 @@ runs:
echo "version=${{ inputs.toolchain }}" >> "$GITHUB_OUTPUT"
fi
+
+ # GitHub Actions default runners have `rustup` instaleld, but IBM-provided
+ # s390x runners do not. If we're using the IBM runner then install rustup.
+ - name: Install rustup
+ shell: bash
+ if: runner.arch == 'S390X'
+ run: |
+ export RUSTUP_HOME=${{ runner.tool_cache }}/rustup
+ export CARGO_HOME=${{ runner.tool_cache }}/cargo
+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
+ sh -s -- \
+ -y \
+ --default-toolchain ${{ steps.select.outputs.version }} \
+ --profile minimal \
+ --no-modify-path
+ echo "RUSTUP_HOME=$RUSTUP_HOME" >> $GITHUB_ENV
+ echo "CARGO_HOME=$CARGO_HOME" >> $GITHUB_ENV
+ echo "$CARGO_HOME/bin" >> $GITHUB_PATH
+
+
- name: Install Rust
shell: bash
run: |
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 50938004f7..0bf0da0c2a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,7 +31,7 @@ defaults:
# Cancel any in-flight jobs for the same PR/branch so there's only one active
# at a time
concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
+ group: ${{ github.workflow }}-${{ github.ref }}2
cancel-in-progress: true
jobs:
@@ -789,7 +789,10 @@ jobs:
# no output. It's believed that `bash` adds things like `/usr/bin` to PATH
# which is the wrong DLL or something like that.
- run: python3 ./ci/run-tests.py --locked ${{ matrix.bucket }}
+ if: runner.os == 'Windows'
shell: pwsh
+ - run: python3 ./ci/run-tests.py --locked ${{ matrix.bucket }}
+ if: runner.os != 'Windows'
# Test `wasmtime-wasi-nn` in its own job, as not all of its backends are
# compatible with all targets, and each must be tested separately anyways.
diff --git a/ci/build-test-matrix.js b/ci/build-test-matrix.js
index 95db8b7f7f..eba0669fab 100644
--- a/ci/build-test-matrix.js
+++ b/ci/build-test-matrix.js
@@ -109,15 +109,19 @@ const FULL_MATRIX = [
"isa": "aarch64",
},
{
- "os": ubuntu,
+ "os": 'ubuntu-24.04-s390x',
"target": "s390x-unknown-linux-gnu",
- "gcc_package": "gcc-s390x-linux-gnu",
- "gcc": "s390x-linux-gnu-gcc",
- "qemu": "qemu-s390x -L /usr/s390x-linux-gnu",
- "qemu_target": "s390x-linux-user",
"name": "Test Linux s390x",
"filter": "linux-s390x",
"isa": "s390x"
+ // These are no longer necessary now that this runner is using an
+ // IBM-provided native runner. If that needs to change, however,
+ // uncommenting these and switching back to `ubuntu` for the os will switch
+ // us back to QEMU emulation.
+ // "gcc_package": "gcc-s390x-linux-gnu",
+ // "gcc": "s390x-linux-gnu-gcc",
+ // "qemu": "qemu-s390x -L /usr/s390x-linux-gnu",
+ // "qemu_target": "s390x-linux-user",
},
{
"os": ubuntu,
diff --git a/crates/test-programs/src/bin/p3_sockets_tcp_bind.rs b/crates/test-programs/src/bin/p3_sockets_tcp_bind.rs
index 8fec2e69c1..3202849084 100644
--- a/crates/test-programs/src/bin/p3_sockets_tcp_bind.rs
+++ b/crates/test-programs/src/bin/p3_sockets_tcp_bind.rs
@@ -4,6 +4,7 @@ use test_programs::p3::wasi::sockets::types::{
ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, TcpSocket,
};
use test_programs::p3::wit_stream;
+use test_programs::sockets::supports_ipv6;
struct Component;
@@ -152,32 +153,28 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
IpAddress::Ipv6((0x2001, 0x0db8, 0, 0, 0, 0, 0, 0)); // Reserved for documentation and examples.
test_tcp_bind_ephemeral_port(IpAddress::IPV4_LOOPBACK);
- test_tcp_bind_ephemeral_port(IpAddress::IPV6_LOOPBACK);
test_tcp_bind_ephemeral_port(IpAddress::IPV4_UNSPECIFIED);
- test_tcp_bind_ephemeral_port(IpAddress::IPV6_UNSPECIFIED);
-
test_tcp_bind_specific_port(IpAddress::IPV4_LOOPBACK);
- test_tcp_bind_specific_port(IpAddress::IPV6_LOOPBACK);
test_tcp_bind_specific_port(IpAddress::IPV4_UNSPECIFIED);
- test_tcp_bind_specific_port(IpAddress::IPV6_UNSPECIFIED);
-
test_tcp_bind_reuseaddr(IpAddress::IPV4_LOOPBACK).await;
- test_tcp_bind_reuseaddr(IpAddress::IPV6_LOOPBACK).await;
-
test_tcp_bind_addrinuse(IpAddress::IPV4_LOOPBACK);
- test_tcp_bind_addrinuse(IpAddress::IPV6_LOOPBACK);
test_tcp_bind_addrinuse(IpAddress::IPV4_UNSPECIFIED);
- test_tcp_bind_addrinuse(IpAddress::IPV6_UNSPECIFIED);
-
test_tcp_bind_addrnotavail(RESERVED_IPV4_ADDRESS);
- test_tcp_bind_addrnotavail(RESERVED_IPV6_ADDRESS);
-
test_tcp_bind_wrong_family(IpAddressFamily::Ipv4);
- test_tcp_bind_wrong_family(IpAddressFamily::Ipv6);
-
- test_tcp_bind_non_unicast();
- test_tcp_bind_dual_stack();
+ if supports_ipv6() {
+ test_tcp_bind_ephemeral_port(IpAddress::IPV6_LOOPBACK);
+ test_tcp_bind_ephemeral_port(IpAddress::IPV6_UNSPECIFIED);
+ test_tcp_bind_specific_port(IpAddress::IPV6_LOOPBACK);
+ test_tcp_bind_specific_port(IpAddress::IPV6_UNSPECIFIED);
+ test_tcp_bind_reuseaddr(IpAddress::IPV6_LOOPBACK).await;
+ test_tcp_bind_addrinuse(IpAddress::IPV6_LOOPBACK);
+ test_tcp_bind_addrinuse(IpAddress::IPV6_UNSPECIFIED);
+ test_tcp_bind_addrnotavail(RESERVED_IPV6_ADDRESS);
+ test_tcp_bind_wrong_family(IpAddressFamily::Ipv6);
+ test_tcp_bind_non_unicast();
+ test_tcp_bind_dual_stack();
+ }
Ok(())
}
diff --git a/crates/test-programs/src/bin/p3_sockets_tcp_connect.rs b/crates/test-programs/src/bin/p3_sockets_tcp_connect.rs
index 49630ced52..68aa91a98a 100644
--- a/crates/test-programs/src/bin/p3_sockets_tcp_connect.rs
+++ b/crates/test-programs/src/bin/p3_sockets_tcp_connect.rs
@@ -2,6 +2,7 @@ use futures::join;
use test_programs::p3::wasi::sockets::types::{
ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, TcpSocket,
};
+use test_programs::sockets::supports_ipv6;
struct Component;
@@ -125,20 +126,18 @@ async fn test_tcp_connect_explicit_bind(family: IpAddressFamily) {
impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
async fn run() -> Result<(), ()> {
test_tcp_connect_unspec(IpAddressFamily::Ipv4).await;
- test_tcp_connect_unspec(IpAddressFamily::Ipv6).await;
-
test_tcp_connect_port_0(IpAddressFamily::Ipv4).await;
- test_tcp_connect_port_0(IpAddressFamily::Ipv6).await;
-
test_tcp_connect_wrong_family(IpAddressFamily::Ipv4).await;
- test_tcp_connect_wrong_family(IpAddressFamily::Ipv6).await;
-
- test_tcp_connect_non_unicast().await;
-
- test_tcp_connect_dual_stack().await;
-
test_tcp_connect_explicit_bind(IpAddressFamily::Ipv4).await;
- test_tcp_connect_explicit_bind(IpAddressFamily::Ipv6).await;
+
+ if supports_ipv6() {
+ test_tcp_connect_unspec(IpAddressFamily::Ipv6).await;
+ test_tcp_connect_port_0(IpAddressFamily::Ipv6).await;
+ test_tcp_connect_wrong_family(IpAddressFamily::Ipv6).await;
+ test_tcp_connect_non_unicast().await;
+ test_tcp_connect_dual_stack().await;
+ test_tcp_connect_explicit_bind(IpAddressFamily::Ipv6).await;
+ }
Ok(())
}
}
diff --git a/crates/test-programs/src/bin/p3_sockets_tcp_sample_application.rs b/crates/test-programs/src/bin/p3_sockets_tcp_sample_application.rs
index e765b92816..4e1f33b3df 100644
--- a/crates/test-programs/src/bin/p3_sockets_tcp_sample_application.rs
+++ b/crates/test-programs/src/bin/p3_sockets_tcp_sample_application.rs
@@ -3,6 +3,7 @@ use test_programs::p3::wasi::sockets::types::{
IpAddressFamily, IpSocketAddress, Ipv4SocketAddress, Ipv6SocketAddress, TcpSocket,
};
use test_programs::p3::wit_stream;
+use test_programs::sockets::supports_ipv6;
use wit_bindgen::StreamResult;
struct Component;
@@ -99,16 +100,18 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
}),
)
.await;
- test_tcp_sample_application(
- IpAddressFamily::Ipv6,
- IpSocketAddress::Ipv6(Ipv6SocketAddress {
- port: 0, // use any free port
- address: (0, 0, 0, 0, 0, 0, 0, 1), // localhost
- flow_info: 0,
- scope_id: 0,
- }),
- )
- .await;
+ if supports_ipv6() {
+ test_tcp_sample_application(
+ IpAddressFamily::Ipv6,
+ IpSocketAddress::Ipv6(Ipv6SocketAddress {
+ port: 0, // use any free port
+ address: (0, 0, 0, 0, 0, 0, 0, 1), // localhost
+ flow_info: 0,
+ scope_id: 0,
+ }),
+ )
+ .await;
+ }
Ok(())
}
}
diff --git a/crates/test-programs/src/bin/p3_sockets_tcp_sockopts.rs b/crates/test-programs/src/bin/p3_sockets_tcp_sockopts.rs
index 18beb46cc2..8d80879832 100644
--- a/crates/test-programs/src/bin/p3_sockets_tcp_sockopts.rs
+++ b/crates/test-programs/src/bin/p3_sockets_tcp_sockopts.rs
@@ -2,6 +2,7 @@ use futures::join;
use test_programs::p3::wasi::sockets::types::{
ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, TcpSocket,
};
+use test_programs::sockets::supports_ipv6;
struct Component;
@@ -218,19 +219,18 @@ async fn test_tcp_sockopt_after_listen(family: IpAddressFamily) {
impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
async fn run() -> Result<(), ()> {
test_tcp_sockopt_defaults(IpAddressFamily::Ipv4);
- test_tcp_sockopt_defaults(IpAddressFamily::Ipv6);
-
test_tcp_sockopt_input_ranges(IpAddressFamily::Ipv4);
- test_tcp_sockopt_input_ranges(IpAddressFamily::Ipv6);
-
test_tcp_sockopt_readback(IpAddressFamily::Ipv4);
- test_tcp_sockopt_readback(IpAddressFamily::Ipv6);
-
test_tcp_sockopt_inheritance(IpAddressFamily::Ipv4).await;
- test_tcp_sockopt_inheritance(IpAddressFamily::Ipv6).await;
-
test_tcp_sockopt_after_listen(IpAddressFamily::Ipv4).await;
- test_tcp_sockopt_after_listen(IpAddressFamily::Ipv6).await;
+
+ if supports_ipv6() {
+ test_tcp_sockopt_defaults(IpAddressFamily::Ipv6);
+ test_tcp_sockopt_input_ranges(IpAddressFamily::Ipv6);
+ test_tcp_sockopt_readback(IpAddressFamily::Ipv6);
+ test_tcp_sockopt_inheritance(IpAddressFamily::Ipv6).await;
+ test_tcp_sockopt_after_listen(IpAddressFamily::Ipv6).await;
+ }
Ok(())
}
}
diff --git a/crates/test-programs/src/bin/p3_sockets_tcp_states.rs b/crates/test-programs/src/bin/p3_sockets_tcp_states.rs
index 0ac7be5f4b..97d3d3b10f 100644
--- a/crates/test-programs/src/bin/p3_sockets_tcp_states.rs
+++ b/crates/test-programs/src/bin/p3_sockets_tcp_states.rs
@@ -2,6 +2,7 @@ use futures::join;
use test_programs::p3::wasi::sockets::types::{
ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, TcpSocket,
};
+use test_programs::sockets::supports_ipv6;
struct Component;
@@ -199,16 +200,17 @@ async fn test_tcp_connected_state_invariants(family: IpAddressFamily) {
impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
async fn run() -> Result<(), ()> {
test_tcp_unbound_state_invariants(IpAddressFamily::Ipv4);
- test_tcp_unbound_state_invariants(IpAddressFamily::Ipv6);
-
test_tcp_bound_state_invariants(IpAddressFamily::Ipv4);
- test_tcp_bound_state_invariants(IpAddressFamily::Ipv6);
-
test_tcp_listening_state_invariants(IpAddressFamily::Ipv4).await;
- test_tcp_listening_state_invariants(IpAddressFamily::Ipv6).await;
-
test_tcp_connected_state_invariants(IpAddressFamily::Ipv4).await;
- test_tcp_connected_state_invariants(IpAddressFamily::Ipv6).await;
+
+ if supports_ipv6() {
+ test_tcp_unbound_state_invariants(IpAddressFamily::Ipv6);
+ test_tcp_bound_state_invariants(IpAddressFamily::Ipv6);
+ test_tcp_listening_state_invariants(IpAddressFamily::Ipv6).await;
+ test_tcp_connected_state_invariants(IpAddressFamily::Ipv6).await;
+ }
+
Ok(())
}
}
diff --git a/crates/test-programs/src/bin/p3_sockets_tcp_streams.rs b/crates/test-programs/src/bin/p3_sockets_tcp_streams.rs
index c4b82a7126..3aaef7a7fc 100644
--- a/crates/test-programs/src/bin/p3_sockets_tcp_streams.rs
+++ b/crates/test-programs/src/bin/p3_sockets_tcp_streams.rs
@@ -5,6 +5,7 @@ use test_programs::p3::wasi::sockets::types::{
IpAddress, IpAddressFamily, IpSocketAddress, TcpSocket,
};
use test_programs::p3::wit_stream;
+use test_programs::sockets::supports_ipv6;
use wit_bindgen::StreamResult;
struct Component;
@@ -185,18 +186,17 @@ async fn test_tcp_read_cancellation(family: IpAddressFamily) {
impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
async fn run() -> Result<(), ()> {
test_tcp_input_stream_should_be_closed_by_remote_shutdown(IpAddressFamily::Ipv4).await;
- test_tcp_input_stream_should_be_closed_by_remote_shutdown(IpAddressFamily::Ipv6).await;
-
test_tcp_input_stream_should_be_closed_by_local_shutdown(IpAddressFamily::Ipv4).await;
- test_tcp_input_stream_should_be_closed_by_local_shutdown(IpAddressFamily::Ipv6).await;
-
test_tcp_output_stream_should_be_closed_by_local_shutdown(IpAddressFamily::Ipv4).await;
- test_tcp_output_stream_should_be_closed_by_local_shutdown(IpAddressFamily::Ipv6).await;
-
test_tcp_shutdown_should_not_lose_data(IpAddressFamily::Ipv4).await;
- test_tcp_shutdown_should_not_lose_data(IpAddressFamily::Ipv6).await;
-
test_tcp_read_cancellation(IpAddressFamily::Ipv4).await;
+
+ if supports_ipv6() {
+ test_tcp_input_stream_should_be_closed_by_remote_shutdown(IpAddressFamily::Ipv6).await;
+ test_tcp_input_stream_should_be_closed_by_local_shutdown(IpAddressFamily::Ipv6).await;
+ test_tcp_output_stream_should_be_closed_by_local_shutdown(IpAddressFamily::Ipv6).await;
+ test_tcp_shutdown_should_not_lose_data(IpAddressFamily::Ipv6).await;
+ }
Ok(())
}
}
diff --git a/crates/test-programs/src/bin/p3_sockets_udp_bind.rs b/crates/test-programs/src/bin/p3_sockets_udp_bind.rs
index 89dc419483..e675c57552 100644
--- a/crates/test-programs/src/bin/p3_sockets_udp_bind.rs
+++ b/crates/test-programs/src/bin/p3_sockets_udp_bind.rs
@@ -2,6 +2,7 @@ use test_programs::p3::sockets::attempt_random_port;
use test_programs::p3::wasi::sockets::types::{
ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, UdpSocket,
};
+use test_programs::sockets::supports_ipv6;
struct Component;
@@ -88,27 +89,26 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
IpAddress::Ipv6((0x2001, 0x0db8, 0, 0, 0, 0, 0, 0)); // Reserved for documentation and examples.
test_udp_bind_ephemeral_port(IpAddress::IPV4_LOOPBACK);
- test_udp_bind_ephemeral_port(IpAddress::IPV6_LOOPBACK);
test_udp_bind_ephemeral_port(IpAddress::IPV4_UNSPECIFIED);
- test_udp_bind_ephemeral_port(IpAddress::IPV6_UNSPECIFIED);
-
test_udp_bind_specific_port(IpAddress::IPV4_LOOPBACK);
- test_udp_bind_specific_port(IpAddress::IPV6_LOOPBACK);
test_udp_bind_specific_port(IpAddress::IPV4_UNSPECIFIED);
- test_udp_bind_specific_port(IpAddress::IPV6_UNSPECIFIED);
-
test_udp_bind_addrinuse(IpAddress::IPV4_LOOPBACK);
- test_udp_bind_addrinuse(IpAddress::IPV6_LOOPBACK);
test_udp_bind_addrinuse(IpAddress::IPV4_UNSPECIFIED);
- test_udp_bind_addrinuse(IpAddress::IPV6_UNSPECIFIED);
-
test_udp_bind_addrnotavail(RESERVED_IPV4_ADDRESS);
- test_udp_bind_addrnotavail(RESERVED_IPV6_ADDRESS);
-
test_udp_bind_wrong_family(IpAddressFamily::Ipv4);
- test_udp_bind_wrong_family(IpAddressFamily::Ipv6);
- test_udp_bind_dual_stack();
+ if supports_ipv6() {
+ test_udp_bind_ephemeral_port(IpAddress::IPV6_LOOPBACK);
+ test_udp_bind_ephemeral_port(IpAddress::IPV6_UNSPECIFIED);
+ test_udp_bind_specific_port(IpAddress::IPV6_LOOPBACK);
+ test_udp_bind_specific_port(IpAddress::IPV6_UNSPECIFIED);
+ test_udp_bind_addrinuse(IpAddress::IPV6_LOOPBACK);
+ test_udp_bind_addrinuse(IpAddress::IPV6_UNSPECIFIED);
+ test_udp_bind_addrnotavail(RESERVED_IPV6_ADDRESS);
+ test_udp_bind_wrong_family(IpAddressFamily::Ipv6);
+ test_udp_bind_dual_stack();
+ }
+
Ok(())
}
}
diff --git a/crates/test-programs/src/bin/p3_sockets_udp_sample_application.rs b/crates/test-programs/src/bin/p3_sockets_udp_sample_application.rs
index fd765d89e9..657bf21ade 100644
--- a/crates/test-programs/src/bin/p3_sockets_udp_sample_application.rs
+++ b/crates/test-programs/src/bin/p3_sockets_udp_sample_application.rs
@@ -2,6 +2,7 @@ use futures::join;
use test_programs::p3::wasi::sockets::types::{
IpAddress, IpAddressFamily, IpSocketAddress, Ipv4SocketAddress, Ipv6SocketAddress, UdpSocket,
};
+use test_programs::sockets::supports_ipv6;
struct Component;
@@ -70,16 +71,18 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
}),
)
.await;
- test_udp_sample_application(
- IpAddressFamily::Ipv6,
- IpSocketAddress::Ipv6(Ipv6SocketAddress {
- port: 0, // use any free port
- address: (0, 0, 0, 0, 0, 0, 0, 1), // localhost
- flow_info: 0,
- scope_id: 0,
- }),
- )
- .await;
+ if supports_ipv6() {
+ test_udp_sample_application(
+ IpAddressFamily::Ipv6,
+ IpSocketAddress::Ipv6(Ipv6SocketAddress {
+ port: 0, // use any free port
+ address: (0, 0, 0, 0, 0, 0, 0, 1), // localhost
+ flow_info: 0,
+ scope_id: 0,
+ }),
+ )
+ .await;
+ }
Ok(())
}
}
diff --git a/crates/test-programs/src/bin/p3_sockets_udp_states.rs b/crates/test-programs/src/bin/p3_sockets_udp_states.rs
index 0bd869f049..6b36fc162f 100644
--- a/crates/test-programs/src/bin/p3_sockets_udp_states.rs
+++ b/crates/test-programs/src/bin/p3_sockets_udp_states.rs
@@ -1,6 +1,7 @@
use test_programs::p3::wasi::sockets::types::{
ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, UdpSocket,
};
+use test_programs::sockets::supports_ipv6;
struct Component;
@@ -82,13 +83,14 @@ fn test_udp_connected_state_invariants(family: IpAddressFamily) {
impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
async fn run() -> Result<(), ()> {
test_udp_unbound_state_invariants(IpAddressFamily::Ipv4).await;
- test_udp_unbound_state_invariants(IpAddressFamily::Ipv6).await;
-
test_udp_bound_state_invariants(IpAddressFamily::Ipv4);
- test_udp_bound_state_invariants(IpAddressFamily::Ipv6);
-
test_udp_connected_state_invariants(IpAddressFamily::Ipv4);
- test_udp_connected_state_invariants(IpAddressFamily::Ipv6);
+
+ if supports_ipv6() {
+ test_udp_unbound_state_invariants(IpAddressFamily::Ipv6).await;
+ test_udp_bound_state_invariants(IpAddressFamily::Ipv6);
+ test_udp_connected_state_invariants(IpAddressFamily::Ipv6);
+ }
Ok(())
}
}
diff --git a/crates/test-programs/src/bin/preview2_tcp_bind.rs b/crates/test-programs/src/bin/preview2_tcp_bind.rs
index 5cc54022e4..9f4673f07f 100644
--- a/crates/test-programs/src/bin/preview2_tcp_bind.rs
+++ b/crates/test-programs/src/bin/preview2_tcp_bind.rs
@@ -1,4 +1,4 @@
-use test_programs::sockets::attempt_random_port;
+use test_programs::sockets::{attempt_random_port, supports_ipv6};
use test_programs::wasi::sockets::network::{
ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, Network,
};
@@ -152,30 +152,26 @@ fn main() {
let net = Network::default();
test_tcp_bind_ephemeral_port(&net, IpAddress::IPV4_LOOPBACK);
- test_tcp_bind_ephemeral_port(&net, IpAddress::IPV6_LOOPBACK);
test_tcp_bind_ephemeral_port(&net, IpAddress::IPV4_UNSPECIFIED);
- test_tcp_bind_ephemeral_port(&net, IpAddress::IPV6_UNSPECIFIED);
-
test_tcp_bind_specific_port(&net, IpAddress::IPV4_LOOPBACK);
- test_tcp_bind_specific_port(&net, IpAddress::IPV6_LOOPBACK);
test_tcp_bind_specific_port(&net, IpAddress::IPV4_UNSPECIFIED);
- test_tcp_bind_specific_port(&net, IpAddress::IPV6_UNSPECIFIED);
-
test_tcp_bind_reuseaddr(&net, IpAddress::IPV4_LOOPBACK);
- test_tcp_bind_reuseaddr(&net, IpAddress::IPV6_LOOPBACK);
-
test_tcp_bind_addrinuse(&net, IpAddress::IPV4_LOOPBACK);
- test_tcp_bind_addrinuse(&net, IpAddress::IPV6_LOOPBACK);
test_tcp_bind_addrinuse(&net, IpAddress::IPV4_UNSPECIFIED);
- test_tcp_bind_addrinuse(&net, IpAddress::IPV6_UNSPECIFIED);
-
test_tcp_bind_addrnotavail(&net, RESERVED_IPV4_ADDRESS);
- test_tcp_bind_addrnotavail(&net, RESERVED_IPV6_ADDRESS);
-
test_tcp_bind_wrong_family(&net, IpAddressFamily::Ipv4);
- test_tcp_bind_wrong_family(&net, IpAddressFamily::Ipv6);
-
- test_tcp_bind_non_unicast(&net);
- test_tcp_bind_dual_stack(&net);
+ if supports_ipv6() {
+ test_tcp_bind_ephemeral_port(&net, IpAddress::IPV6_LOOPBACK);
+ test_tcp_bind_ephemeral_port(&net, IpAddress::IPV6_UNSPECIFIED);
+ test_tcp_bind_specific_port(&net, IpAddress::IPV6_LOOPBACK);
+ test_tcp_bind_specific_port(&net, IpAddress::IPV6_UNSPECIFIED);
+ test_tcp_bind_reuseaddr(&net, IpAddress::IPV6_LOOPBACK);
+ test_tcp_bind_addrinuse(&net, IpAddress::IPV6_LOOPBACK);
+ test_tcp_bind_addrinuse(&net, IpAddress::IPV6_UNSPECIFIED);
+ test_tcp_bind_addrnotavail(&net, RESERVED_IPV6_ADDRESS);
+ test_tcp_bind_wrong_family(&net, IpAddressFamily::Ipv6);
+ test_tcp_bind_non_unicast(&net);
+ test_tcp_bind_dual_stack(&net);
+ }
}
diff --git a/crates/test-programs/src/bin/preview2_tcp_connect.rs b/crates/test-programs/src/bin/preview2_tcp_connect.rs
index 6ffae5983c..0320165763 100644
--- a/crates/test-programs/src/bin/preview2_tcp_connect.rs
+++ b/crates/test-programs/src/bin/preview2_tcp_connect.rs
@@ -1,3 +1,4 @@
+use test_programs::sockets::supports_ipv6;
use test_programs::wasi::sockets::network::{
ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, Network,
};
@@ -123,18 +124,17 @@ fn main() {
let net = Network::default();
test_tcp_connect_unspec(&net, IpAddressFamily::Ipv4);
- test_tcp_connect_unspec(&net, IpAddressFamily::Ipv6);
-
test_tcp_connect_port_0(&net, IpAddressFamily::Ipv4);
- test_tcp_connect_port_0(&net, IpAddressFamily::Ipv6);
-
test_tcp_connect_wrong_family(&net, IpAddressFamily::Ipv4);
- test_tcp_connect_wrong_family(&net, IpAddressFamily::Ipv6);
-
- test_tcp_connect_non_unicast(&net);
+ test_tcp_connect_explicit_bind(&net, IpAddressFamily::Ipv4);
- test_tcp_connect_dual_stack(&net);
+ if supports_ipv6() {
+ test_tcp_connect_unspec(&net, IpAddressFamily::Ipv6);
+ test_tcp_connect_port_0(&net, IpAddressFamily::Ipv6);
+ test_tcp_connect_wrong_family(&net, IpAddressFamily::Ipv6);
+ test_tcp_connect_non_unicast(&net);
- test_tcp_connect_explicit_bind(&net, IpAddressFamily::Ipv4);
- test_tcp_connect_explicit_bind(&net, IpAddressFamily::Ipv6);
+ test_tcp_connect_dual_stack(&net);
+ test_tcp_connect_explicit_bind(&net, IpAddressFamily::Ipv6);
+ }
}
diff --git a/crates/test-programs/src/bin/preview2_tcp_sample_application.rs b/crates/test-programs/src/bin/preview2_tcp_sample_application.rs
index cdbacfbc92..dcc7ed8fa0 100644
--- a/crates/test-programs/src/bin/preview2_tcp_sample_application.rs
+++ b/crates/test-programs/src/bin/preview2_tcp_sample_application.rs
@@ -1,3 +1,4 @@
+use test_programs::sockets::supports_ipv6;
use test_programs::wasi::sockets::network::{
IpAddressFamily, IpSocketAddress, Ipv4SocketAddress, Ipv6SocketAddress, Network,
};
@@ -61,13 +62,15 @@ fn main() {
address: (127, 0, 0, 1), // localhost
}),
);
- test_tcp_sample_application(
- IpAddressFamily::Ipv6,
- IpSocketAddress::Ipv6(Ipv6SocketAddress {
- port: 0, // use any free port
- address: (0, 0, 0, 0, 0, 0, 0, 1), // localhost
- flow_info: 0,
- scope_id: 0,
- }),
- );
+ if supports_ipv6() {
+ test_tcp_sample_application(
+ IpAddressFamily::Ipv6,
+ IpSocketAddress::Ipv6(Ipv6SocketAddress {
+ port: 0, // use any free port
+ address: (0, 0, 0, 0, 0, 0, 0, 1), // localhost
+ flow_info: 0,
+ scope_id: 0,
+ }),
+ );
+ }
}
diff --git a/crates/test-programs/src/bin/preview2_tcp_sockopts.rs b/crates/test-programs/src/bin/preview2_tcp_sockopts.rs
index d52f7c8f90..723b0c22ec 100644
--- a/crates/test-programs/src/bin/preview2_tcp_sockopts.rs
+++ b/crates/test-programs/src/bin/preview2_tcp_sockopts.rs
@@ -1,3 +1,4 @@
+use test_programs::sockets::supports_ipv6;
use test_programs::wasi::sockets::network::{
ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, Network,
};
@@ -216,17 +217,16 @@ fn main() {
let net = Network::default();
test_tcp_sockopt_defaults(IpAddressFamily::Ipv4);
- test_tcp_sockopt_defaults(IpAddressFamily::Ipv6);
-
test_tcp_sockopt_input_ranges(IpAddressFamily::Ipv4);
- test_tcp_sockopt_input_ranges(IpAddressFamily::Ipv6);
-
test_tcp_sockopt_readback(IpAddressFamily::Ipv4);
- test_tcp_sockopt_readback(IpAddressFamily::Ipv6);
-
test_tcp_sockopt_inheritance(&net, IpAddressFamily::Ipv4);
- test_tcp_sockopt_inheritance(&net, IpAddressFamily::Ipv6);
-
test_tcp_sockopt_after_listen(&net, IpAddressFamily::Ipv4);
- test_tcp_sockopt_after_listen(&net, IpAddressFamily::Ipv6);
+
+ if supports_ipv6() {
+ test_tcp_sockopt_defaults(IpAddressFamily::Ipv6);
+ test_tcp_sockopt_input_ranges(IpAddressFamily::Ipv6);
+ test_tcp_sockopt_readback(IpAddressFamily::Ipv6);
+ test_tcp_sockopt_inheritance(&net, IpAddressFamily::Ipv6);
+ test_tcp_sockopt_after_listen(&net, IpAddressFamily::Ipv6);
+ }
}
diff --git a/crates/test-programs/src/bin/preview2_tcp_states.rs b/crates/test-programs/src/bin/preview2_tcp_states.rs
index 4d31e36cf0..b2b45be9c7 100644
--- a/crates/test-programs/src/bin/preview2_tcp_states.rs
+++ b/crates/test-programs/src/bin/preview2_tcp_states.rs
@@ -1,3 +1,4 @@
+use test_programs::sockets::supports_ipv6;
use test_programs::wasi::sockets::network::{
ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, Network,
};
@@ -216,14 +217,14 @@ fn main() {
let net = Network::default();
test_tcp_unbound_state_invariants(IpAddressFamily::Ipv4);
- test_tcp_unbound_state_invariants(IpAddressFamily::Ipv6);
-
test_tcp_bound_state_invariants(&net, IpAddressFamily::Ipv4);
- test_tcp_bound_state_invariants(&net, IpAddressFamily::Ipv6);
-
test_tcp_listening_state_invariants(&net, IpAddressFamily::Ipv4);
- test_tcp_listening_state_invariants(&net, IpAddressFamily::Ipv6);
-
test_tcp_connected_state_invariants(&net, IpAddressFamily::Ipv4);
- test_tcp_connected_state_invariants(&net, IpAddressFamily::Ipv6);
+
+ if supports_ipv6() {
+ test_tcp_unbound_state_invariants(IpAddressFamily::Ipv6);
+ test_tcp_bound_state_invariants(&net, IpAddressFamily::Ipv6);
+ test_tcp_listening_state_invariants(&net, IpAddressFamily::Ipv6);
+ test_tcp_connected_state_invariants(&net, IpAddressFamily::Ipv6);
+ }
}
diff --git a/crates/test-programs/src/bin/preview2_tcp_streams.rs b/crates/test-programs/src/bin/preview2_tcp_streams.rs
index c756958968..1641e0f868 100644
--- a/crates/test-programs/src/bin/preview2_tcp_streams.rs
+++ b/crates/test-programs/src/bin/preview2_tcp_streams.rs
@@ -1,3 +1,4 @@
+use test_programs::sockets::supports_ipv6;
use test_programs::wasi::io::streams::{InputStream, OutputStream, StreamError};
use test_programs::wasi::sockets::network::{IpAddress, IpAddressFamily, IpSocketAddress, Network};
use test_programs::wasi::sockets::tcp::{ShutdownType, TcpSocket};
@@ -113,16 +114,16 @@ fn main() {
let net = Network::default();
test_tcp_input_stream_should_be_closed_by_remote_shutdown(&net, IpAddressFamily::Ipv4);
- test_tcp_input_stream_should_be_closed_by_remote_shutdown(&net, IpAddressFamily::Ipv6);
-
test_tcp_input_stream_should_be_closed_by_local_shutdown(&net, IpAddressFamily::Ipv4);
- test_tcp_input_stream_should_be_closed_by_local_shutdown(&net, IpAddressFamily::Ipv6);
-
test_tcp_output_stream_should_be_closed_by_local_shutdown(&net, IpAddressFamily::Ipv4);
- test_tcp_output_stream_should_be_closed_by_local_shutdown(&net, IpAddressFamily::Ipv6);
-
test_tcp_shutdown_should_not_lose_data(&net, IpAddressFamily::Ipv4);
- test_tcp_shutdown_should_not_lose_data(&net, IpAddressFamily::Ipv6);
+
+ if supports_ipv6() {
+ test_tcp_input_stream_should_be_closed_by_remote_shutdown(&net, IpAddressFamily::Ipv6);
+ test_tcp_input_stream_should_be_closed_by_local_shutdown(&net, IpAddressFamily::Ipv6);
+ test_tcp_output_stream_should_be_closed_by_local_shutdown(&net, IpAddressFamily::Ipv6);
+ test_tcp_shutdown_should_not_lose_data(&net, IpAddressFamily::Ipv6);
+ }
}
struct Connection {
diff --git a/crates/test-programs/src/bin/preview2_udp_bind.rs b/crates/test-programs/src/bin/preview2_udp_bind.rs
index 8b366bcf9e..67388ac1cb 100644
--- a/crates/test-programs/src/bin/preview2_udp_bind.rs
+++ b/crates/test-programs/src/bin/preview2_udp_bind.rs
@@ -1,4 +1,5 @@
use test_programs::sockets::attempt_random_port;
+use test_programs::sockets::supports_ipv6;
use test_programs::wasi::sockets::network::{
ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, Network,
};
@@ -89,25 +90,31 @@ fn main() {
let net = Network::default();
test_udp_bind_ephemeral_port(&net, IpAddress::IPV4_LOOPBACK);
- test_udp_bind_ephemeral_port(&net, IpAddress::IPV6_LOOPBACK);
test_udp_bind_ephemeral_port(&net, IpAddress::IPV4_UNSPECIFIED);
- test_udp_bind_ephemeral_port(&net, IpAddress::IPV6_UNSPECIFIED);
test_udp_bind_specific_port(&net, IpAddress::IPV4_LOOPBACK);
- test_udp_bind_specific_port(&net, IpAddress::IPV6_LOOPBACK);
test_udp_bind_specific_port(&net, IpAddress::IPV4_UNSPECIFIED);
- test_udp_bind_specific_port(&net, IpAddress::IPV6_UNSPECIFIED);
test_udp_bind_addrinuse(&net, IpAddress::IPV4_LOOPBACK);
- test_udp_bind_addrinuse(&net, IpAddress::IPV6_LOOPBACK);
test_udp_bind_addrinuse(&net, IpAddress::IPV4_UNSPECIFIED);
- test_udp_bind_addrinuse(&net, IpAddress::IPV6_UNSPECIFIED);
test_udp_bind_addrnotavail(&net, RESERVED_IPV4_ADDRESS);
- test_udp_bind_addrnotavail(&net, RESERVED_IPV6_ADDRESS);
test_udp_bind_wrong_family(&net, IpAddressFamily::Ipv4);
test_udp_bind_wrong_family(&net, IpAddressFamily::Ipv6);
- test_udp_bind_dual_stack(&net);
+ if supports_ipv6() {
+ test_udp_bind_ephemeral_port(&net, IpAddress::IPV6_LOOPBACK);
+ test_udp_bind_ephemeral_port(&net, IpAddress::IPV6_UNSPECIFIED);
+
+ test_udp_bind_specific_port(&net, IpAddress::IPV6_LOOPBACK);
+ test_udp_bind_specific_port(&net, IpAddress::IPV6_UNSPECIFIED);
+
+ test_udp_bind_addrinuse(&net, IpAddress::IPV6_LOOPBACK);
+ test_udp_bind_addrinuse(&net, IpAddress::IPV6_UNSPECIFIED);
+
+ test_udp_bind_addrnotavail(&net, RESERVED_IPV6_ADDRESS);
+
+ test_udp_bind_dual_stack(&net);
+ }
}
diff --git a/crates/test-programs/src/bin/preview2_udp_sample_application.rs b/crates/test-programs/src/bin/preview2_udp_sample_application.rs
index ca001769f6..9e3b730b0d 100644
--- a/crates/test-programs/src/bin/preview2_udp_sample_application.rs
+++ b/crates/test-programs/src/bin/preview2_udp_sample_application.rs
@@ -1,3 +1,4 @@
+use test_programs::sockets::supports_ipv6;
use test_programs::wasi::sockets::network::{
IpAddress, IpAddressFamily, IpSocketAddress, Ipv4SocketAddress, Ipv6SocketAddress, Network,
};
@@ -80,13 +81,15 @@ fn main() {
address: (127, 0, 0, 1), // localhost
}),
);
- test_udp_sample_application(
- IpAddressFamily::Ipv6,
- IpSocketAddress::Ipv6(Ipv6SocketAddress {
- port: 0, // use any free port
- address: (0, 0, 0, 0, 0, 0, 0, 1), // localhost
- flow_info: 0,
- scope_id: 0,
- }),
- );
+ if supports_ipv6() {
+ test_udp_sample_application(
+ IpAddressFamily::Ipv6,
+ IpSocketAddress::Ipv6(Ipv6SocketAddress {
+ port: 0, // use any free port
+ address: (0, 0, 0, 0, 0, 0, 0, 1), // localhost
+ flow_info: 0,
+ scope_id: 0,
+ }),
+ );
+ }
}
diff --git a/crates/test-programs/src/bin/preview2_udp_states.rs b/crates/test-programs/src/bin/preview2_udp_states.rs
index 314f94a25b..918aff88d3 100644
--- a/crates/test-programs/src/bin/preview2_udp_states.rs
+++ b/crates/test-programs/src/bin/preview2_udp_states.rs
@@ -1,3 +1,4 @@
+use test_programs::sockets::supports_ipv6;
use test_programs::wasi::sockets::network::{
ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, Network,
};
@@ -83,11 +84,12 @@ fn main() {
let net = Network::default();
test_udp_unbound_state_invariants(IpAddressFamily::Ipv4);
- test_udp_unbound_state_invariants(IpAddressFamily::Ipv6);
-
test_udp_bound_state_invariants(&net, IpAddressFamily::Ipv4);
- test_udp_bound_state_invariants(&net, IpAddressFamily::Ipv6);
-
test_udp_connected_state_invariants(&net, IpAddressFamily::Ipv4);
- test_udp_connected_state_invariants(&net, IpAddressFamily::Ipv6);
+
+ if supports_ipv6() {
+ test_udp_unbound_state_invariants(IpAddressFamily::Ipv6);
+ test_udp_bound_state_invariants(&net, IpAddressFamily::Ipv6);
+ test_udp_connected_state_invariants(&net, IpAddressFamily::Ipv6);
+ }
}
diff --git a/crates/test-programs/src/sockets.rs b/crates/test-programs/src/sockets.rs
index 8683cb340e..cc8adae4c5 100644
--- a/crates/test-programs/src/sockets.rs
+++ b/crates/test-programs/src/sockets.rs
@@ -17,6 +17,10 @@ use std::ops::Range;
const TIMEOUT_NS: u64 = 1_000_000_000;
+pub fn supports_ipv6() -> bool {
+ std::env::var("DISABLE_IPV6").is_err()
+}
+
impl Pollable {
pub fn block_until(&self, timeout: &Pollable) -> Result<(), ErrorCode> {
let ready = poll::poll(&[self, timeout]);
diff --git a/crates/wasi/tests/all/store.rs b/crates/wasi/tests/all/store.rs
index 5fca50c3f5..f96b7cb561 100644
--- a/crates/wasi/tests/all/store.rs
+++ b/crates/wasi/tests/all/store.rs
@@ -43,6 +43,11 @@ impl<T> Ctx<T> {
builder.env(var, val);
}
+ let supports_ipv6 = std::net::TcpListener::bind((std::net::Ipv6Addr::LOCALHOST, 0)).is_ok();
+ if !supports_ipv6 {
+ builder.env("DISABLE_IPV6", "1");
+ }
+
let ctx = Ctx {
wasi: configure(&mut builder),
stderr,