From d73393a0789984105302ad5b3d92265d8c9bfc82 Mon Sep 17 00:00:00 2001 From: iphydf Date: Wed, 22 Dec 2021 01:18:43 +0000 Subject: [PATCH] chore: Fix FreeBSD build. --- .travis/cmake-freebsd-stage2 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.travis/cmake-freebsd-stage2 b/.travis/cmake-freebsd-stage2 index c1a44cab..97c6d857 100755 --- a/.travis/cmake-freebsd-stage2 +++ b/.travis/cmake-freebsd-stage2 @@ -5,16 +5,19 @@ set -eux -cd .. -mv c-toxcore / -mkdir c-toxcore +if [ "$PWD" != "/work" ]; then + cd .. + mv c-toxcore / + mkdir c-toxcore + cd /work +fi -pushd /work -. cmake-freebsd-env.sh -popd +. cmake-freebsd-run.sh # === Get VM ready to build the code === +gunzip "$IMAGE_NAME.gz" + start_vm # Copy over toxcore code from Travis to qemu @@ -42,7 +45,7 @@ RUN 'cmake -B_build -Hc-toxcore \ -DMUST_BUILD_TOXAV=ON \ -DNON_HERMETIC_TESTS=ON \ -DSTRICT_ABI=ON \ - -DTEST_TIMEOUT_SECONDS=300 \ + -DTEST_TIMEOUT_SECONDS=90 \ -DUSE_IPV6=OFF \ -DAUTOTEST=ON'