Skip to content

Use GTEST_SKIP in unsupported tests (backport #604)#611

Closed
mergify[bot] wants to merge 1 commit into
ign-sensors6from
mergify/bp/ign-sensors6/pr-604
Closed

Use GTEST_SKIP in unsupported tests (backport #604)#611
mergify[bot] wants to merge 1 commit into
ign-sensors6from
mergify/bp/ign-sensors6/pr-604

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Apr 17, 2026

🦟 Bug fix

Part of gazebosim/gz-rendering#1235

Summary

While checking whether gz-sensors tests are using ogre2 on macOS, I noticed that very few tests are using GTEST_SKIP() for unsupported engines, so this switches the gzdbg stream then return pattern to stream directly to GTEST_SKIP() as is done in gz-rendering.

On Ubuntu, this shows an increase of 1 skipped test:

On macOS, there are many new skipped tests due to the removal of ogre1.9 in osrf/homebrew-simulation#3394 (see follow-up work in #605).

This also fixes a segfault of INTEGRATION_dvl when the render engine plugin fails to load, which also started failing on macOS when ogre1.9 was removed in osrf/homebrew-simulation#3394.

Checklist

  • Signed all commits for DCO
  • Added a screen capture or video to the PR description that demonstrates the fix (as needed)
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • Updated Bazel files (if adding new files). Created an issue otherwise.
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers
  • Was GenAI used to generate this PR? If so, make sure to add "Generated-by" to your commits. (See this policy for more info.)

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by and Generated-by messages.

Backports: If this is a backport, please use Rebase and Merge instead.


This is an automatic backport of pull request #604 done by [Mergify](https://mergify.com).

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Apr 17, 2026

Cherry-pick of fc58044 has failed:

On branch mergify/bp/ign-sensors6/pr-604
Your branch is up to date with 'origin/ign-sensors6'.

You are currently cherry-picking commit fc58044.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   test/integration/boundingbox_camera.cc
	both modified:   test/integration/camera.cc
	both modified:   test/integration/depth_camera.cc
	both modified:   test/integration/distortion_camera.cc
	deleted by us:   test/integration/dvl.cc
	both modified:   test/integration/gpu_lidar_sensor.cc
	both modified:   test/integration/rgbd_camera.cc
	both modified:   test/integration/segmentation_camera.cc
	both modified:   test/integration/thermal_camera.cc
	deleted by us:   test/integration/triggered_boundingbox_camera.cc
	both modified:   test/integration/triggered_camera.cc
	deleted by us:   test/integration/wide_angle_camera.cc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot added the conflicts label Apr 17, 2026
@mergify mergify Bot requested a review from iche033 as a code owner April 17, 2026 22:37
@github-actions github-actions Bot added the 🏯 fortress Ignition Fortress label Apr 17, 2026
@mergify mergify Bot mentioned this pull request Apr 17, 2026
11 tasks
Also includes the following changes:

* distortion_camera test: reference github issue
* [fix] dvl test: check pointer in TearDown
  The TearDown unconditionally dereferences the
  engine pointer, which segfaults if the engine failed
  to load. Check the pointer before dereferencing.

Signed-off-by: Steve Peters <scpeters@intrinsic.ai>
(cherry picked from commit fc58044)
@scpeters scpeters force-pushed the mergify/bp/ign-sensors6/pr-604 branch from b2507d1 to 547dce5 Compare April 17, 2026 22:57
@scpeters
Copy link
Copy Markdown
Member

I resolved conflicts

@scpeters
Copy link
Copy Markdown
Member

we don't have GTEST_SKIP in our vendored gtest on fortress; let's skip this

@scpeters scpeters closed this Apr 17, 2026
@github-project-automation github-project-automation Bot moved this from Inbox to Done in Core development Apr 17, 2026
@scpeters scpeters deleted the mergify/bp/ign-sensors6/pr-604 branch April 17, 2026 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🏯 fortress Ignition Fortress

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

2 participants