Force alignment on arm32 #103
Merged
Conversation
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
|
Hmm, as-written this will technically hit arm32v5 too, which doesn't need it. 🤔 |
This fixes our test failures on Debian-based arm32v7, and fixes *most* of our test failures on Alpine-based arm32v{6,7}, leaving the notable `t/restart.t` which we've had issues with prior.
tianon
commented
Apr 1, 2025
| @@ -91,6 +91,10 @@ RUN set -eux; \ | |||
| cd /usr/src/memcached; \ | |||
| \ | |||
| gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ | |||
| # https://github.com/memcached/memcached/issues/1220#issuecomment-2770251664: on arm32, we need to override the upstream alignment check (which fails to detect the need for alignment on arm32v6+ on our hardware for some reason, which then causes us to fail the tests 😭) | |||
| case "$gnuArch" in \ | |||
| arm-*abihf) export ac_cv_c_alignment=need ;; \ | |||
There was a problem hiding this comment.
The two values we need to capture here are arm-linux-gnueabihf and arm-linux-musleabihf (vs arm-linux-gnueabi which we not want to match).
yosifkit
approved these changes
Apr 1, 2025
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Apr 1, 2025
Changes: - docker-library/memcached@f8aa037: Merge pull request docker-library/memcached#104 from infosiftr/backport-extstore-test-fixes - docker-library/memcached@d6fbe6b: Merge pull request docker-library/memcached#103 from infosiftr/arm32-alignment - docker-library/memcached@f3f961a: Backport upstream extstore test improvements - docker-library/memcached@1336cbc: Force alignment on arm32 - docker-library/memcached@9152f80: Add back arm32v6+v7 so we can try them again
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 fixes our test failures on Debian-based arm32v7, and fixes most of our test failures on Alpine-based arm32v{6,7}, leaving the notable
t/restart.twhich we've had issues with prior (memcached/memcached#799).See also memcached/memcached#1220 (comment) (and surrounding chatter).