From c91b55a20193894da4ba8eccab703c81ca7139a8 Mon Sep 17 00:00:00 2001 From: Jakub Czapiga Date: Thu, 14 Apr 2022 12:01:59 +0200 Subject: [PATCH] tests: update CMocka to stable-1.1 CMocka stable-1.1 has some convenience bugfixes like vprint buffer increase or leftover values log fix (funtion names display correctly now. Signed-off-by: Jakub Czapiga Change-Id: I20ebd15324a21c17cccd2976ae9c3f86b040426d Reviewed-on: https://review.coreboot.org/c/coreboot/+/63636 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- .gitmodules | 1 + 3rdparty/cmocka | 2 +- tests/lib/b64_decode-test.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 68230b92ed..69aa470ea6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -48,6 +48,7 @@ path = 3rdparty/cmocka url = ../cmocka.git update = none + branch = stable-1.1 [submodule "3rdparty/qc_blobs"] path = 3rdparty/qc_blobs url = ../qc_blobs.git diff --git a/3rdparty/cmocka b/3rdparty/cmocka index 672c5cee79..8931845c35 160000 --- a/3rdparty/cmocka +++ b/3rdparty/cmocka @@ -1 +1 @@ -Subproject commit 672c5cee79eb412025c3dd8b034e611c1f119055 +Subproject commit 8931845c35e78b5123d73430b071affd537d5935 diff --git a/tests/lib/b64_decode-test.c b/tests/lib/b64_decode-test.c index 631dc15f7d..189ce96237 100644 --- a/tests/lib/b64_decode-test.c +++ b/tests/lib/b64_decode-test.c @@ -35,7 +35,7 @@ static void test_b64_decode(void **state) res = b64_decode((uint8_t *)messages[i].enc, strlen(messages[i].enc), decoded); assert_int_equal(res, (strlen(messages[i].dec))); - assert_string_equal(decoded, messages[i].dec); + assert_string_equal((const char *)decoded, messages[i].dec); free(decoded); }