Symlink glmark2 data directory in snapcraft.yaml (BugFix)#2281
Draft
tomli380576 wants to merge 11 commits intomainfrom
Draft
Symlink glmark2 data directory in snapcraft.yaml (BugFix)#2281tomli380576 wants to merge 11 commits intomainfrom
tomli380576 wants to merge 11 commits intomainfrom
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #2281 +/- ##
=======================================
Coverage 54.49% 54.49%
=======================================
Files 409 409
Lines 43970 43970
Branches 8100 8100
=======================================
Hits 23961 23961
+ Misses 19190 19187 -3
- Partials 819 822 +3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 10 out of 10 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This file contains hidden or 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
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.
Description
The symlink hack in #1677 and #2087 no longer works in snapd 2.73 when using the strict frontend on ubuntu desktop. This PR adds the
layoutsection to allucversions of the checkbox snap to fix this issue once and for all. Test scripts no longer have to differentiate between deb/snap when calling glmark2.This is a pretty huge change that will impact all checkbox snaps, so please let me know if there's a better way to do this.
Note that this only fixes the path issue. Issues with graphics libraries not found will not be fixed by this. Right now the wayland version of glmark2, when invoked from inside the snap on a classic desktop image, will immediately exit with "Error: main: Could not initialize canvas".
Resolved issues
/usr/share/glmark2being hardcoded in glmark2Documentation
Using
bindin the uc snaps leads to an empty/usr/share/glmark2directory insnap run --shell checkbox-clithereforesymlinkwas used.Tests
Manually tested the snaps built in https://github.com/canonical/checkbox/actions/runs/20984775039 on 24.04 desktop
glmark2, window launches. Wayland and es2 variants are broken because of missing graphics libraries, not the data path.ls /usr/share/glmark2and the path existsTODO: test the snaps on ubuntu core
C3 submissions: see #2287