Merge pull request #54 from traversaro/add-smoke-tests

Add on Linux/macOS smoke tests and fix OpenAL macOS problems
conda-forge · Mar 3, 2021 · 1a8dac7 · 1a8dac7
2 parents 984e7f8 + bd7110d
commit 1a8dac7
Show file tree

Hide file tree

Showing 15 changed files with 156 additions and 37 deletions.
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -41,6 +41,8 @@ qt:
 - '5.12'
 target_platform:
 - linux-64
+tbb_devel:
+- '2020'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

diff --git a/.ci_support/migrations/libprotobuf315.yaml b/.ci_support/migrations/libprotobuf315.yaml
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -45,6 +45,8 @@ qt:
 - '5.12'
 target_platform:
 - osx-64
+tbb_devel:
+- '2020'
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -29,3 +29,5 @@ qt:
 - '5.12'
 target_platform:
 - win-64
+tbb_devel:
+- '2020'
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
diff --git a/recipe/disable-openal.patch b/recipe/disable-openal.patch
@@ -0,0 +1,26 @@
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index 3d87f4305d..ee4978c4db 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -71,13 +71,14 @@ else ()
+ endif ()
+
+ ########################################
+-include (FindOpenAL)
+-if (NOT OPENAL_FOUND)
+-  BUILD_WARNING ("OpenAL not found, audio support will be disabled.")
+-  set (HAVE_OPENAL OFF CACHE BOOL "HAVE OpenAL" FORCE)
+-else ()
+-  set (HAVE_OPENAL ON CACHE BOOL "HAVE OpenAL" FORCE)
+-endif ()
++# include (FindOpenAL)
++# if (NOT OPENAL_FOUND)
++#   BUILD_WARNING ("OpenAL not found, audio support will be disabled.")
++#   set (HAVE_OPENAL OFF CACHE BOOL "HAVE OpenAL" FORCE)
++# else ()
++#   set (HAVE_OPENAL ON CACHE BOOL "HAVE OpenAL" FORCE)
++# endif ()
++set (HAVE_OPENAL OFF CACHE BOOL "HAVE OpenAL" FORCE)
+
+ ########################################
+ find_package(HDF5 COMPONENTS C CXX)
diff --git a/recipe/link_openal.patch b/recipe/link_openal.patch
@@ -0,0 +1,25 @@
+From 075c13de5c5553f6290c1a53a39d9165fc8cfd76 Mon Sep 17 00:00:00 2001
+From: Silvio Traversaro <[email protected]>
+Date: Tue, 2 Mar 2021 19:13:27 +0100
+Subject: [PATCH] Fix missing link to OpenAL in gazebo_util library
+
+---
+ gazebo/util/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gazebo/util/CMakeLists.txt b/gazebo/util/CMakeLists.txt
+index 2c69f2b250..5831fc1aab 100644
+--- a/gazebo/util/CMakeLists.txt
++++ b/gazebo/util/CMakeLists.txt
+@@ -85,6 +85,10 @@ target_link_libraries(gazebo_util
+   ${IGNITION-MSGS_LIBRARIES}
+ )
+
++if (HAVE_OPENAL)
++  target_link_libraries(gazebo_util ${OPENAL_LIBRARY})
++endif()
++
+ # define if tinxml2 major version >= 6
+ # https://github.com/ignitionrobotics/ign-common/issues/28
+ if (NOT tinyxml2_VERSION VERSION_LESS "6.0.0")
+
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -14,9 +14,10 @@ source:
       - normalize-ogre-path.patch
       - cmake_129_workaround.patch  # [unix]
       - 2906.patch
+      - disable-openal.patch
 
 build:
-  number: 7
+  number: 8
   skip: false
   run_exports:
     - {{ pin_subpackage('gazebo', max_pin='x') }}
@@ -125,6 +126,9 @@ test:
     - test -f $PREFIX/bin/gzserver  # [unix]
     - test -f $PREFIX/bin/gzclient  # [unix]
     - test -f $PREFIX/bin/gazebo    # [unix]
+    - gzserver --version | grep "Gazebo multi-robot simulator, version"  # [unix]
+    - gzclient --version | grep "Gazebo multi-robot simulator, version"  # [unix]
+    - gazebo --version | grep "Gazebo multi-robot simulator, version"  # [unix]
 
 about:
   home: http://gazebosim.org/

diff --git a/recipe/yum_requirements.txt b/recipe/yum_requirements.txt
@@ -0,0 +1,6 @@
+mesa-libGL
+mesa-dri-drivers
+libselinux
+libXdamage
+libXxf86vm
+libXext
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,3 +29,5 @@ qt: @@
     - '5.12'
     target_platform:
     - win-64
+    tbb_devel:
+    - '2020'