From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: devel@edk2.groups.io
Cc: Sean Brogan <sean.brogan@microsoft.com>,
Bret Barkelew <Bret.Barkelew@microsoft.com>
Subject: [Patch 3/3] UnitTestFrameworkPkg: Update cmocka submodule to 5a4b15870efa
Date: Wed, 9 Feb 2022 18:41:53 -0800 [thread overview]
Message-ID: <20220210024153.1894-4-michael.d.kinney@intel.com> (raw)
In-Reply-To: <20220210024153.1894-1-michael.d.kinney@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2853
cmocka issue and commit that increases the log message length:
* https://gitlab.com/cmocka/cmocka/-/issues/51
* https://gitlab.com/cmocka/cmocka/-/commit/36c85066dee0113e0b743d886c001ae76ca1fea9
Update cmocka to a version that supports longer log messages.
This update requires <stdint.h> to be included before <cmocka.h>.
The legacy cmockery feature has been removed, so the private
include path to cmockery in the DEC file is no longer required.
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
UnitTestFrameworkPkg/Library/CmockaLib/cmocka | 2 +-
UnitTestFrameworkPkg/Library/UnitTestLib/AssertCmocka.c | 1 +
UnitTestFrameworkPkg/Library/UnitTestLib/RunTestsCmocka.c | 1 +
UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec | 1 -
4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/UnitTestFrameworkPkg/Library/CmockaLib/cmocka b/UnitTestFrameworkPkg/Library/CmockaLib/cmocka
index 1cc9cde3448c..5a4b15870efa 160000
--- a/UnitTestFrameworkPkg/Library/CmockaLib/cmocka
+++ b/UnitTestFrameworkPkg/Library/CmockaLib/cmocka
@@ -1 +1 @@
-Subproject commit 1cc9cde3448cdd2e000886a26acf1caac2db7cf1
+Subproject commit 5a4b15870efa2225e6586fbb4c3af05ff0659434
diff --git a/UnitTestFrameworkPkg/Library/UnitTestLib/AssertCmocka.c b/UnitTestFrameworkPkg/Library/UnitTestLib/AssertCmocka.c
index dc05bbd4384c..e829f37bb898 100644
--- a/UnitTestFrameworkPkg/Library/UnitTestLib/AssertCmocka.c
+++ b/UnitTestFrameworkPkg/Library/UnitTestLib/AssertCmocka.c
@@ -9,6 +9,7 @@
#include <string.h>
#include <stdarg.h>
#include <stddef.h>
+#include <stdint.h>
#include <setjmp.h>
#include <cmocka.h>
diff --git a/UnitTestFrameworkPkg/Library/UnitTestLib/RunTestsCmocka.c b/UnitTestFrameworkPkg/Library/UnitTestLib/RunTestsCmocka.c
index ca4dae120690..0ab5c6af2221 100644
--- a/UnitTestFrameworkPkg/Library/UnitTestLib/RunTestsCmocka.c
+++ b/UnitTestFrameworkPkg/Library/UnitTestLib/RunTestsCmocka.c
@@ -9,6 +9,7 @@
#include <string.h>
#include <stdarg.h>
#include <stddef.h>
+#include <stdint.h>
#include <setjmp.h>
#include <cmocka.h>
diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec b/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec
index 069289f00969..66ed512edf84 100644
--- a/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec
+++ b/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec
@@ -20,7 +20,6 @@ [Includes]
[Includes.Common.Private]
PrivateInclude
- Library/CmockaLib/cmocka/include/cmockery
[LibraryClasses.Common.Private]
## @libraryclass Allows save and restore unit test internal state
--
2.32.0.windows.1
next prev parent reply other threads:[~2022-02-10 2:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 2:41 [Patch 0/3] Update cmocka submodule to 5a4b15870efa Michael D Kinney
2022-02-10 2:41 ` [Patch 1/3] MdeModulePkg: Include <stdint.h> for host based unit tests Michael D Kinney
2022-02-10 2:41 ` [Patch 2/3] UefiCpuPkg: " Michael D Kinney
2022-02-10 2:44 ` Ni, Ray
2022-02-10 2:41 ` Michael D Kinney [this message]
2022-02-11 16:38 ` [edk2-devel] [Patch 0/3] Update cmocka submodule to 5a4b15870efa thomas.j.rydman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220210024153.1894-4-michael.d.kinney@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox