From 89a673d54250dd03638e83744185f0ebd80dcc06 Mon Sep 17 00:00:00 2001 From: Konstantinos Chatzilygeroudis Date: Thu, 1 Feb 2024 11:05:22 +0200 Subject: [PATCH] Let's fix tests as well --- .github/workflows/ci_linux.yml | 8 ++++---- ci/install_packages.sh | 2 +- wscript | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index 2f5a7d99..f008e416 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -63,13 +63,13 @@ jobs: fi cd ${{github.workspace}} if [ "$BUILD_PYTHON" = "ON" ]; then - ./waf configure --python --prefix=/usr --dart=~/.dart_install ; + ./waf configure --tests --python --prefix=/usr --dart=~/.dart_install ; else - ./waf configure --prefix=/usr --dart=~/.dart_install ; + ./waf configure --tests --prefix=/usr --dart=~/.dart_install ; fi ./waf - # - name: Run tests - # run: ./waf --tests + - name: Run tests + run: ./waf --tests - name: Build examples run: ./waf examples - name: Install diff --git a/ci/install_packages.sh b/ci/install_packages.sh index 63ed6654..6c2d7c79 100755 --- a/ci/install_packages.sh +++ b/ci/install_packages.sh @@ -2,7 +2,7 @@ sudo apt-get -qq update sudo apt-get -y install software-properties-common mlocate sudo apt-add-repository -y ppa:dartsim/ppa sudo apt-get -qq update -sudo apt-get install -y --no-install-recommends build-essential cmake pkg-config git libeigen3-dev libccd-dev libfcl-dev libboost-regex-dev libboost-system-dev libbullet-dev libode-dev liboctomap-dev libtinyxml-dev libtinyxml2-dev liburdfdom-dev liburdfdom-headers-dev python3-pip python3-numpy libpython3-dev libxi-dev libxmu-dev freeglut3-dev libopenscenegraph-dev libassimp-dev libfmt-dev pybind11-dev +sudo apt-get install -y --no-install-recommends build-essential cmake pkg-config git libeigen3-dev libccd-dev libfcl-dev libboost-regex-dev libboost-system-dev libboost-filesystem-dev libboost-test-dev libbullet-dev libode-dev liboctomap-dev libtinyxml-dev libtinyxml2-dev liburdfdom-dev liburdfdom-headers-dev python3-pip python3-numpy libpython3-dev libxi-dev libxmu-dev freeglut3-dev libopenscenegraph-dev libassimp-dev libfmt-dev pybind11-dev sudo ln -s /usr/bin/python3 /usr/bin/python diff --git a/wscript b/wscript index 53c2dafc..7f302501 100644 --- a/wscript +++ b/wscript @@ -103,7 +103,7 @@ def configure_robot_dart(conf): conf.check(features='cxx cxxprogram', lib=['pthread'], uselib_store='PTHREAD') conf.check_eigen(required=True, min_version=(3,2,92)) conf.check_dart(required=True) - if conf.env['DART_REQUIRES_BOOST']: + if conf.env['DART_REQUIRES_BOOST'] or conf.options.tests: conf.check_boost(lib='regex system filesystem unit_test_framework', min_version='1.58') conf.check_corrade(components='Utility PluginManager', required=False) conf.env['magnum_dep_libs'] = 'MeshTools Primitives Shaders SceneGraph GlfwApplication Text MagnumFont'