From b3c3c49d26c0cf2b91b9ec69f9a3f932ab9f2d6d Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Mon, 4 Mar 2024 19:24:15 -0500 Subject: [PATCH] fix: Disable IPv6 in Windows cross-compilation tests Docker doesn't have an IPv6 network by default, so these tests were failing when using IPv6. --- .github/scripts/cmake-windows.sh | 2 +- INSTALL.md | 14 +++++++------- other/docker/windows/Dockerfile | 2 +- other/windows_build_script_toxcore.sh | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/scripts/cmake-windows.sh b/.github/scripts/cmake-windows.sh index fdcd7a8b91..a794ad1ef4 100644 --- a/.github/scripts/cmake-windows.sh +++ b/.github/scripts/cmake-windows.sh @@ -18,7 +18,7 @@ docker run \ -e ENABLE_ARCH_i686="$i686" \ -e ENABLE_ARCH_x86_64="$x86_64" \ -e ENABLE_TEST=true \ - -e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90 -DAUTOTEST=ON" \ + -e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90 -DAUTOTEST=ON -DUSE_IPV6=OFF" \ -e CMAKE_C_FLAGS="$C_FLAGS" \ -e CMAKE_CXX_FLAGS="$CXX_FLAGS" \ -e CMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ diff --git a/INSTALL.md b/INSTALL.md index 857954b6ff..3754faac3b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -322,13 +322,13 @@ docker build \ Run the container to build toxcore. The following options are available to customize the running of the container image. -| Name | Description | Expected Value | Default Value | -| -------------------- | ------------------------------------------------------------------------------------------ | ----------------------------------- | --------------------------- | -| `ALLOW_TEST_FAILURE` | Don't stop if a test suite fails. | "true" or "false" (case sensitive). | `false` | -| `ENABLE_ARCH_i686` | Build 32-bit toxcore. The image should have been built with `SUPPORT_ARCH_i686` enabled. | "true" or "false" (case sensitive). | `true` | -| `ENABLE_ARCH_x86_64` | Build 64-bit toxcore. The image should have been built with `SUPPORT_ARCH_x86_64` enabled. | "true" or "false" (case sensitive). | `true` | -| `ENABLE_TEST` | Run the test suite. The image should have been built with `SUPPORT_TEST` enabled. | "true" or "false" (case sensitive). | `false` | -| `EXTRA_CMAKE_FLAGS` | Extra arguments to pass to the CMake command when building toxcore. | CMake options. | `-DTEST_TIMEOUT_SECONDS=90` | +| Name | Description | Expected Value | Default Value | +| -------------------- | ------------------------------------------------------------------------------------------ | ----------------------------------- | ------------------------------------------ | +| `ALLOW_TEST_FAILURE` | Don't stop if a test suite fails. | "true" or "false" (case sensitive). | `false` | +| `ENABLE_ARCH_i686` | Build 32-bit toxcore. The image should have been built with `SUPPORT_ARCH_i686` enabled. | "true" or "false" (case sensitive). | `true` | +| `ENABLE_ARCH_x86_64` | Build 64-bit toxcore. The image should have been built with `SUPPORT_ARCH_x86_64` enabled. | "true" or "false" (case sensitive). | `true` | +| `ENABLE_TEST` | Run the test suite. The image should have been built with `SUPPORT_TEST` enabled. | "true" or "false" (case sensitive). | `false` | +| `EXTRA_CMAKE_FLAGS` | Extra arguments to pass to the CMake command when building toxcore. | CMake options. | `-DTEST_TIMEOUT_SECONDS=90 -DUSE_IPV6=OFF` | Example of running the container with options diff --git a/other/docker/windows/Dockerfile b/other/docker/windows/Dockerfile index caa7a66733..ac7ba11c85 100644 --- a/other/docker/windows/Dockerfile +++ b/other/docker/windows/Dockerfile @@ -34,6 +34,6 @@ ENV ENABLE_TEST=false \ ALLOW_TEST_FAILURE=false \ ENABLE_ARCH_i686=true \ ENABLE_ARCH_x86_64=true \ - EXTRA_CMAKE_FLAGS="-DTEST_TIMEOUT_SECONDS=90" + EXTRA_CMAKE_FLAGS="-DTEST_TIMEOUT_SECONDS=90 -DUSE_IPV6=OFF" ENTRYPOINT ["bash", "./build_toxcore.sh"] diff --git a/other/windows_build_script_toxcore.sh b/other/windows_build_script_toxcore.sh index 9f2202d254..1f006451ca 100644 --- a/other/windows_build_script_toxcore.sh +++ b/other/windows_build_script_toxcore.sh @@ -19,6 +19,6 @@ export ENABLE_TEST=false export ALLOW_TEST_FAILURE=false export ENABLE_ARCH_i686=true export ENABLE_ARCH_x86_64=true -export EXTRA_CMAKE_FLAGS="-DTEST_TIMEOUT_SECONDS=90" +export EXTRA_CMAKE_FLAGS="-DTEST_TIMEOUT_SECONDS=90 -DUSE_IPV6=OFF" sh ./other/docker/windows/build_toxcore.sh