[Patch 0/3] Update cmocka submodule to 5a4b15870efa

[Patch 0/3] Update cmocka submodule to 5a4b15870efa

[Michael D Kinney]

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
Cc: Eric Dong eric.dong@intel.com
Cc: Ray Ni ray.ni@intel.com
Cc: Rahul Kumar rahul1.kumar@intel.com
Cc: Jian J Wang jian.j.wang@intel.com
Cc: Liming Gao gaoliming@byosoft.com.cn
Signed-off-by: Michael D Kinney michael.d.kinney@intel.com

Michael D Kinney (3):
  MdeModulePkg: Include <stdint.h> for host based unit tests
  UefiCpuPkg: Include <stdint.h> for host based unit tests
  UnitTestFrameworkPkg: Update cmocka submodule to 5a4b15870efa

 .../DxeResetSystemLib/UnitTest/DxeResetSystemLibUnitTest.c      | 1 +
 MdeModulePkg/Library/UefiSortLib/UnitTest/UefiSortLibUnitTest.c | 1 +
 .../RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c      | 1 +
 UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h           | 1 +
 UnitTestFrameworkPkg/Library/CmockaLib/cmocka                   | 2 +-
 UnitTestFrameworkPkg/Library/UnitTestLib/AssertCmocka.c         | 1 +
 UnitTestFrameworkPkg/Library/UnitTestLib/RunTestsCmocka.c       | 1 +
 UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec                   | 1 -
 8 files changed, 7 insertions(+), 2 deletions(-)

-- 
2.32.0.windows.1

[Patch 1/3] MdeModulePkg: Include <stdint.h> for host based unit tests

[Michael D Kinney]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2853

Update cmocka to a version that supports longer log messages.
This update requires <stdint.h> to be included before <cmocka.h>.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../DxeResetSystemLib/UnitTest/DxeResetSystemLibUnitTest.c       | 1 +
 MdeModulePkg/Library/UefiSortLib/UnitTest/UefiSortLibUnitTest.c  | 1 +
 .../RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/MdeModulePkg/Library/DxeResetSystemLib/UnitTest/DxeResetSystemLibUnitTest.c b/MdeModulePkg/Library/DxeResetSystemLib/UnitTest/DxeResetSystemLibUnitTest.c
index c286f57c854f..ed0b1602c724 100644
--- a/MdeModulePkg/Library/DxeResetSystemLib/UnitTest/DxeResetSystemLibUnitTest.c
+++ b/MdeModulePkg/Library/DxeResetSystemLib/UnitTest/DxeResetSystemLibUnitTest.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
diff --git a/MdeModulePkg/Library/UefiSortLib/UnitTest/UefiSortLibUnitTest.c b/MdeModulePkg/Library/UefiSortLib/UnitTest/UefiSortLibUnitTest.c
index 3d15167f9a47..2de9814fbd2c 100644
--- a/MdeModulePkg/Library/UefiSortLib/UnitTest/UefiSortLibUnitTest.c
+++ b/MdeModulePkg/Library/UefiSortLib/UnitTest/UefiSortLibUnitTest.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c
index b2bcb97932ba..a584fbb226dc 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/RuntimeDxeUnitTest/VariableLockRequestToLockUnitTest.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
-- 
2.32.0.windows.1

[Patch 2/3] UefiCpuPkg: Include <stdint.h> for host based unit tests

[Michael D Kinney]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2853

Update cmocka to a version that supports longer log messages.
This update requires <stdint.h> to be included before <cmocka.h>.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h
index 57e656c5550e..c120c3634b3a 100644
--- a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h
+++ b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h
@@ -13,6 +13,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 #include <time.h>
-- 
2.32.0.windows.1

Re: [Patch 2/3] UefiCpuPkg: Include <stdint.h> for host based unit tests

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

-----Original Message-----
From: Kinney, Michael D <michael.d.kinney@intel.com> 
Sent: Thursday, February 10, 2022 10:42 AM
To: devel@edk2.groups.io
Cc: Dong, Eric <eric.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Kumar, Rahul1 <rahul1.kumar@intel.com>
Subject: [Patch 2/3] UefiCpuPkg: Include <stdint.h> for host based unit tests

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2853

Update cmocka to a version that supports longer log messages.
This update requires <stdint.h> to be included before <cmocka.h>.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h
index 57e656c5550e..c120c3634b3a 100644
--- a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h
+++ b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.h
@@ -13,6 +13,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 #include <time.h>
-- 
2.32.0.windows.1

[Patch 3/3] UnitTestFrameworkPkg: Update cmocka submodule to 5a4b15870efa

[Michael D Kinney]

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

Re: [edk2-devel] [Patch 0/3] Update cmocka submodule to 5a4b15870efa

[thomas.j.rydman]

[-- Attachment #1: Type: text/plain, Size: 52 bytes --]

Tested-by: Thomas Rdyman Thomas.j.rydman@intel.com

[-- Attachment #2: Type: text/html, Size: 222 bytes --]