Backport to 9: fixes for gzserver shutdown and ogre log test #2968
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
iche033
reviewed
Apr 14, 2021
| @@ -0,0 +1,140 @@ | |||
| <?xml version="1.0" ?> | |||
| <sdf version='1.7'> | |||
There was a problem hiding this comment.
will this work in gazebo9? it's using sdformat6 which has sdf spec up to 1.6
There was a problem hiding this comment.
good point. I think we can downgrade that version. I'll test locally
There was a problem hiding this comment.
the test still fails even after downgrading this to 1.6 since the libsdformat6 parser ignores unrecognized elements like <ignition:env_texture_format> (some history in gazebosim/sdformat#327 (comment))
so we will need a different solution on gazebo9
There was a problem hiding this comment.
I'm going to redact #2960 from this PR because it won't work with libsdformat6
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
* Add debugging output to ogre_log test * ogre_log test: ignore GLX extension line Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters
force-pushed
the
backport_wide_angle_9
branch
from
6116553
to
1ea1841
Compare
scpeters
changed the title
iche033
approved these changes
Apr 20, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This backports the following pull requests to gazebo9:
Specify wide angle camera cube map texture format #2960: Specify wide angle camera cube map texture formatredacted because it doesn't work with libsdformat6Use rebase and merge.