Skip to content

Commit

Permalink
Merge pull request #35 from traversaro/enabletests
Browse files Browse the repository at this point in the history
[v9] Enable tests
  • Loading branch information
traversaro authored Oct 3, 2024
2 parents 38c866d + 6963db2 commit c9d0439
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-alma-x86_64:8
target_platform:
- linux-64
zip_keys:
Expand Down
14 changes: 13 additions & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions recipe/1073.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 22602b48308f1097af464e8e5d2c7fd4f9273aeb Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <[email protected]>
Date: Thu, 3 Oct 2024 16:33:40 +0200
Subject: [PATCH] Fix running rendering tests in GZ_ENABLE_RELOCATABLE_INSTALL
is ON

Signed-off-by: Silvio Traversaro <[email protected]>
---
test/gz_rendering_test.cmake | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/test/gz_rendering_test.cmake b/test/gz_rendering_test.cmake
index 4868bb363..f5ffe511d 100644
--- a/test/gz_rendering_test.cmake
+++ b/test/gz_rendering_test.cmake
@@ -81,6 +81,11 @@ macro(gz_configure_rendering_test)
APPEND PROPERTY
ENVIRONMENT "GZ_ENGINE_BACKEND=${gz_configure_rendering_test_RENDER_ENGINE_BACKEND}")

+ set_property(
+ TEST ${test_name}
+ APPEND PROPERTY
+ ENVIRONMENT "GZ_RENDERING_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
+
if(gz_configure_rendering_test_HEADLESS)
set_property(
TEST ${test_name}
7 changes: 2 additions & 5 deletions recipe/bld_cxx.bat
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,8 @@ cmake --build . --config Release --target install
if errorlevel 1 exit 1

:: Test.
:: Do not run tests as they require to open a display and this is not supported on CI at the moment
:: See https://github.com/conda-forge/libignition-rendering4-feedstock/pull/19#issuecomment-937678806
:: set RENDER_ENGINE_VALUES=ogre
:: ctest --output-on-failure -C Release -E "INTEGRATION|PERFORMANCE|REGRESSION|UNIT_RenderingIface_TEST|check_"
:: if errorlevel 1 exit 1
:: Disabled as they are not currently running in CI on Windows
:: ctest --output-on-failure -C Release -E "PERFORMANCE"

setlocal EnableDelayedExpansion
:: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d.
Expand Down
13 changes: 7 additions & 6 deletions recipe/build_cxx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@ cmake ${CMAKE_ARGS} -GNinja .. \
cmake --build . --config Release
cmake --build . --config Release --target install

# UNIT_Heightmap_TEST disabled for https://github.com/conda-forge/libignition-rendering4-feedstock/issues/10
# if [[ "${CONDA_BUILD_CROSS_COMPILATION}" != "1" ]]; then
# Do not run tests as they require to open a display and this is not supported on CI at the moment
# See https://github.com/conda-forge/libignition-rendering4-feedstock/pull/19#issuecomment-937678806
# ctest --extra-verbose --output-on-failure -C Release -E "INTEGRATION|PERFORMANCE|REGRESSION|UNIT_RenderingIface_TEST|check_UNIT_RenderingIface_TEST|UNIT_Heightmap_TEST"
# fi
# PERFORMANCE tests are disabled as they could fail on test machines
# _ogre_ test disabled as GLX is required for _ogre_
# UNIT_RenderingIface_TEST disabled due to https://github.com/gazebosim/gz-rendering/issues/1072
# _metal test disabled as metal tests are not running in CI
if [[ "${CONDA_BUILD_CROSS_COMPILATION}" != "1" ]]; then
ctest --output-on-failure -C Release -E "PERFORMANCE|_ogre_|UNIT_RenderingIface_TEST|_metal"
fi

# Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
# This will allow them to be run on environment activation.
Expand Down
3 changes: 3 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# EGL mesa driver on cos7 are not working as expected, use alma8 instead
docker_image: # [linux64]
- quay.io/condaforge/linux-anvil-alma-x86_64:8 # [linux64]
1 change: 1 addition & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ source:
sha256: 3eb56a495c61e9274e24421f54ee074b01745c8d02f8f0e877aa346d562a3d32
patches:
- 1071.patch
- 1073.patch

build:
number: 1
Expand Down
2 changes: 2 additions & 0 deletions recipe/yum_requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
mesa-libEGL
mesa-dri-drivers

0 comments on commit c9d0439

Please sign in to comment.