Fix: build: Handle CMocka check_expected() deprecation #4014
+64
−46
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
nrwahl2
force-pushed
the
nrwahl2-cmocka
branch
3 times, most recently
from
db0bfed to
5ed1769
Compare
We'll need to handle a few more of these in upcoming commits. Some of them are used in multiple files, so it will be easier and cleaner to collect them in one place rather than having them in each file where they're needed. Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
CMocka 1.1.4 started requiring stdint.h (commit 8d99418e). CMocka 2.0.0 started requiring stdbool.h (commit f9e5b1fa) and also started including the required headers by default (commit cbdd14a7, but we cannot rely on this). Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
I added this in commit 215ad4f, and it's unclear why I used it instead of assert_int_equal(). Maybe I thought assert_int_equal() would use the int data type and thus overflow for some values, and that assert_in_range() somehow would not. In fact, assert_int_equal() is a macro that casts its arguments to the largest integer type before comparing them. Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
We know it's a macro, so just use #ifndef in unittest_internal.h. Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
This caused CI failures in newer builders. The check_expected_*() definitions could go in mock.c instead of unittest_internal.h. It's unlikely that they'll ever be used in any other .c file. However, it seems reasonable to collect everything in one place. Amusingly, CMocka provides macros to check the current CMocka version, but they're not available until CMocka 2.0.0. Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
nrwahl2
force-pushed
the
nrwahl2-cmocka
branch
from
5ed1769 to
a5afd58
Compare
Contributor
Author
|
@clumens I'm gonna merge this since it fixes build failures. Feel free to take a look when you're back, and we can revisit this if needed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
No description provided.