diff options
Diffstat (limited to '.travis/cmake-freebsd-stage2')
-rwxr-xr-x | .travis/cmake-freebsd-stage2 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.travis/cmake-freebsd-stage2 b/.travis/cmake-freebsd-stage2 index 9750531e..609cd618 100755 --- a/.travis/cmake-freebsd-stage2 +++ b/.travis/cmake-freebsd-stage2 | |||
@@ -1,5 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | # Toxcore building | ||
4 | |||
3 | ACTION="$1" | 5 | ACTION="$1" |
4 | 6 | ||
5 | set -eux | 7 | set -eux |
@@ -7,7 +9,8 @@ set -eux | |||
7 | . .travis/cmake-freebsd-env.sh | 9 | . .travis/cmake-freebsd-env.sh |
8 | 10 | ||
9 | travis_install() { | 11 | travis_install() { |
10 | . .travis/cmake-freebsd-install.sh | 12 | sudo apt-get update |
13 | sudo apt-get install -y qemu screen | ||
11 | 14 | ||
12 | OLD_PWD="$PWD" | 15 | OLD_PWD="$PWD" |
13 | 16 | ||
@@ -29,10 +32,6 @@ travis_install() { | |||
29 | 32 | ||
30 | start_vm | 33 | start_vm |
31 | 34 | ||
32 | # Display FreeBSD kernel info and last login | ||
33 | RUN uname -a | ||
34 | RUN last | ||
35 | |||
36 | cd "$OLD_PWD" | 35 | cd "$OLD_PWD" |
37 | 36 | ||
38 | # Copy over toxcore code from Travis to qemu | 37 | # Copy over toxcore code from Travis to qemu |
@@ -59,14 +58,15 @@ travis_script() { | |||
59 | -DMIN_LOGGER_LEVEL=TRACE \ | 58 | -DMIN_LOGGER_LEVEL=TRACE \ |
60 | -DMUST_BUILD_TOXAV=ON \ | 59 | -DMUST_BUILD_TOXAV=ON \ |
61 | -DSTRICT_ABI=ON \ | 60 | -DSTRICT_ABI=ON \ |
62 | -DTEST_TIMEOUT_SECONDS=120 \ | 61 | -DTEST_TIMEOUT_SECONDS=300 \ |
63 | -DUSE_IPV6=OFF \ | 62 | -DUSE_IPV6=OFF \ |
64 | -DAUTOTEST=ON' | 63 | -DAUTOTEST=ON' |
65 | 64 | ||
66 | # We created the VM with the same number of cores as the host, so the host-ran `nproc` here is fine | 65 | # We created the VM with the same number of cores as the host, so the host-ran `nproc` here is fine |
67 | RUN 'gmake "-j$NPROC" -k install -C_build' | 66 | RUN 'gmake "-j$NPROC" -k install -C_build' |
68 | RUN 'gmake "-j$NPROC" test ARGS="-j50" -C_build || \ | 67 | RUN 'gmake "-j$NPROC" test ARGS="-j50" -C_build || \ |
69 | gmake "-j$NPROC" -C_build test ARGS="-j50 --rerun-failed" CTEST_OUTPUT_ON_FAILURE=1 || \ | 68 | gmake "-j1" -C_build test ARGS="-j1 --rerun-failed" || \ |
69 | gmake "-j1" -C_build test ARGS="-j1 --rerun-failed" CTEST_OUTPUT_ON_FAILURE=1 || \ | ||
70 | true' | 70 | true' |
71 | } | 71 | } |
72 | 72 | ||