Test arch arm thread swap minor fix #19310
Merged
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
ioannisg
added
bug
11 tasks
zephyrbot
added
the
area: Tests
pabigot
requested changes
Sep 21, 2019
We use inline assembly to store the return value of _swap(..) function directly into r0 (in order to ensure that r4-r11 registers are not touched at this point). But we need to store the r0 into some global memory, to retain the value until we check it later in an assert expression, otherwise the compiler may overwrite r0 in subsequent instructions. Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
The commit fixes two assert expressions in the test, which evaluate the return value of _swap(.) function and the value of the thread's swap return variable. Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
ioannisg
force-pushed
the
test_arch_arm_thread_swap_minor_fix
branch
from
cd7e38e to
45bd788
Compare
pabigot
approved these changes
Sep 21, 2019
|
The original (and patched) version passed under #18991 so this should be good. Thanks. |
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v1.14-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 45bd788059e1225571909911772bdb6de95f508e 7f47cf7bc055df69e4f113f6fa83d3a9d2898c6c
# Create a new branch with these backported commits.
git checkout -b backport-19310-to-v1.14-branch
# Push it to GitHub.
git push --set-upstream origin backport-19310-to-v1.14-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backportThen, create a pull request where the |
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.
Fixes a bug in erroneous zassert expression in arm thread swap test suite
Fixes #18999