From 6b2a837bf2fe4b640ed890672df81e045035451d Mon Sep 17 00:00:00 2001 From: iphydf Date: Wed, 22 Nov 2023 18:40:10 +0000 Subject: [PATCH] chore: Retry freebsd tests 2 times. Also, use `cmake --build` instead of manually calling `gmake`. This allows us to maybe later use `ninja` instead of `gmake` without changing this build invocation. Also, increase timeout to 120 seconds. FreeBSD tests are slow. --- .github/scripts/cmake-freebsd | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/scripts/cmake-freebsd b/.github/scripts/cmake-freebsd index a7101f392e7..13011752ad3 100755 --- a/.github/scripts/cmake-freebsd +++ b/.github/scripts/cmake-freebsd @@ -10,7 +10,10 @@ cd .. # /work # === Get VM ready to build the code === -gunzip "$IMAGE_NAME.gz" +# Unpack image only if it's compressed. +if [ -f "$IMAGE_NAME.gz" ]; then + gunzip "$IMAGE_NAME.gz" +fi mv c-toxcore / @@ -43,13 +46,13 @@ RUN "cmake -B_build -Hc-toxcore \ -DMUST_BUILD_TOXAV=ON \ -DNON_HERMETIC_TESTS=ON \ -DSTRICT_ABI=ON \ - -DTEST_TIMEOUT_SECONDS=90 \ + -DTEST_TIMEOUT_SECONDS=120 \ -DUSE_IPV6=OFF \ -DAUTOTEST=ON" # We created the VM with the same number of cores as the host, so the host-ran `nproc` here is fine. -RUN 'gmake "-j$NPROC" -k install -C_build' -RUN 'gmake "-j$NPROC" test ARGS="-j50" -C_build || true' +RUN 'cmake --build _build --parallel "$NPROC" --target install -- -k' +RUN 'cd _build && ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:2 --timeout 120 || true' # Gracefully shut down the VM. stop_vm