Merge baac721 into 2adcb97

gazebosim · Jul 1, 2022 · 62fce79 · 62fce79
2 parents 2adcb97 + baac721
commit 62fce79
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/test/integration/camera.cc b/test/integration/camera.cc
@@ -18,6 +18,7 @@
 #include <gtest/gtest.h>
 
 #include <ignition/common/Console.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 
@@ -835,7 +836,9 @@ TEST_P(CameraTest, VisualAt)
 }
 
 /////////////////////////////////////////////////
-TEST_P(CameraTest, ShaderSelection)
+// See: https://github.com/gazebosim/gz-rendering/issues/654
+TEST_P(CameraTest,
+       IGN_UTILS_TEST_DISABLED_ON_MAC(ShaderSelection))
 {
   ShaderSelection(GetParam());
 }

diff --git a/test/integration/thermal_camera.cc b/test/integration/thermal_camera.cc
@@ -20,6 +20,7 @@
 #include <ignition/common/Console.hh>
 #include <ignition/common/Filesystem.hh>
 #include <ignition/common/Event.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include <ignition/math/Color.hh>
 
@@ -628,7 +629,9 @@ void ThermalCameraTest::ThermalCameraParticles(
   ignition::rendering::unloadEngine(engine->Name());
 }
 
-TEST_P(ThermalCameraTest, ThermalCameraBoxesUniformTemp)
+// See: https://github.com/gazebosim/gz-rendering/issues/654
+TEST_P(ThermalCameraTest,
+       IGN_UTILS_TEST_DISABLED_ON_MAC(ThermalCameraBoxesUniformTemp))
 {
   ThermalCameraBoxes(GetParam(), false);
 }