From d6d20c0b7427f0bc9fa92a6207c62ee7d01f75cf Mon Sep 17 00:00:00 2001 From: Ian Henriksen Date: Thu, 9 Jan 2025 11:35:17 -0700 Subject: [PATCH] Move freebsd build to use CMake. --- .cirrus.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index b7febe709..5e92dec44 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -62,16 +62,15 @@ freebsd_task: env: QTHREADS_SCHEDULER: distrib install_deps_script: | - pkg install -y bash - pkg install -y llvm autoconf automake libtool + pkg install -y llvm cmake pkg install -y coreutils # to get gtimeout for CI. The built-in timeout sometimes fails to kill the process. build_script: | - bash autogen.sh - bash configure --enable-picky --with-scheduler=$QTHREADS_SCHEDULER --with-topology=no - make -j$CIRRUS_CPU - make tests -j$CIRRUS_CPU + mkdir build + cd build + cmake -DCMAKE_BUILD_TYPE=Release -DQTHREADS_SCHEDULER=$QTHREADS_SCHEDULER -DQTHREADS_TOPOLOGY=no -DQTHREADS_CONTEXT_SWAP_IMPL=system .. + make -j$CIRRUS_CPU VERBOSE=1 test_script: | - gtimeout --foreground -k 10s 2m make check || ( cat test/basics/test-suite.log && cat test/features/test-suite.log && cat test/stress/test-suite.log && exit 1 ) + CTEST_OUTPUT_ON_FAILURE=1 gtimeout --foreground -k 10s 2m make test VERBOSE=1 arm_linux_task: arm_container: