Merged: https://github.com/tianocore/edk2/pull/5296


> -----Original Message-----
> From: Kinney, Michael D <michael.d.kin...@intel.com>
> Sent: Tuesday, January 23, 2024 9:36 PM
> To: devel@edk2.groups.io; jbra...@nvidia.com
> Cc: gaolim...@byosoft.com.cn; Liu, Zhiguang <zhiguang....@intel.com>;
> Kinney, Michael D <michael.d.kin...@intel.com>
> Subject: RE: [edk2-devel] [PATCH v3 1/1] MdePkg: Add FdtLib gmock
> support
> 
> Reviewed-by: Michael D Kinney <michael.d.kin...@intel.com>
> 
> I also see you opened a PR to run EDK II CI and it passed.
> 
> I will merge V3
> 
> Thanks,
> 
> Mike
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Jeff
> > Brasen via groups.io
> > Sent: Tuesday, January 23, 2024 7:08 PM
> > To: devel@edk2.groups.io
> > Cc: gaolim...@byosoft.com.cn; Kinney, Michael D
> > <michael.d.kin...@intel.com>; Liu, Zhiguang <zhiguang....@intel.com>;
> > Jeff Brasen <jbra...@nvidia.com>
> > Subject: [edk2-devel] [PATCH v3 1/1] MdePkg: Add FdtLib gmock support
> >
> > Add Google Mock Library for FdtLib
> >
> > Signed-off-by: Jeff Brasen <jbra...@nvidia.com>
> > ---
> >  MdePkg/Test/MdePkgHostTest.dsc                |   1 +
> >  .../GoogleTest/MockFdtLib/MockFdtLib.inf      |  28 +++
> >  .../Include/GoogleTest/Library/MockFdtLib.h   | 164
> ++++++++++++++++++
> >  .../GoogleTest/MockFdtLib/MockFdtLib.cpp      |  34 ++++
> >  4 files changed, 227 insertions(+)
> >  create mode 100644
> > MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.inf
> >  create mode 100644
> > MdePkg/Test/Mock/Include/GoogleTest/Library/MockFdtLib.h
> >  create mode 100644
> > MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.cpp
> >
> > diff --git a/MdePkg/Test/MdePkgHostTest.dsc
> > b/MdePkg/Test/MdePkgHostTest.dsc
> > index 583f8fc0ddd8..e666636b7c55 100644
> > --- a/MdePkg/Test/MdePkgHostTest.dsc
> > +++ b/MdePkg/Test/MdePkgHostTest.dsc
> > @@ -45,3 +45,4 @@ [Components]
> >
> >
> MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/Mock
> > UefiRuntimeServicesTableLib.inf
> >
> >
> MdePkg/Test/Mock/Library/GoogleTest/MockPeiServicesLib/MockPeiServicesLi
> > b.inf
> >    MdePkg/Test/Mock/Library/GoogleTest/MockHobLib/MockHobLib.inf
> > +  MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.inf
> > diff --git
> > a/MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.inf
> > b/MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.inf
> > new file mode 100644
> > index 000000000000..b227bcbae963
> > --- /dev/null
> > +++ b/MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.inf
> > @@ -0,0 +1,28 @@
> > +## @file
> > +# Google Test mocks for FdtLib
> > +#
> > +# Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights
> > reserved.
> > +# Copyright (c) 2023, Intel Corporation. All rights reserved.
> > +# SPDX-License-Identifier: BSD-2-Clause-Patent
> > +##
> > +
> > +[Defines]
> > +  INF_VERSION                    = 0x00010005
> > +  BASE_NAME                      = MockFdtLib
> > +  FILE_GUID                      = 0f5471bc-fc2c-4cf4-b9f7-
> c1396d32831c
> > +  MODULE_TYPE                    = HOST_APPLICATION
> > +  VERSION_STRING                 = 1.0
> > +  LIBRARY_CLASS                  = FdtLib
> > +
> > +[Sources]
> > +  MockFdtLib.cpp
> > +
> > +[Packages]
> > +  MdePkg/MdePkg.dec
> > +  UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec
> > +
> > +[LibraryClasses]
> > +  GoogleTestLib
> > +
> > +[BuildOptions]
> > +  MSFT:*_*_*_CC_FLAGS = /EHsc /bigobj
> > diff --git a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockFdtLib.h
> > b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockFdtLib.h
> > new file mode 100644
> > index 000000000000..5b21b232b7c7
> > --- /dev/null
> > +++ b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockFdtLib.h
> > @@ -0,0 +1,164 @@
> > +/** @file
> > +  Google Test mocks for FdtLib
> > +
> > +  Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights
> > reserved.
> > +  Copyright (c) 2023, Intel Corporation. All rights reserved.
> > +  SPDX-License-Identifier: BSD-2-Clause-Patent
> > +**/
> > +
> > +#ifndef MOCK_FDT_LIB_H_
> > +#define MOCK_FDT_LIB_H_
> > +
> > +#include <Library/GoogleTestLib.h>
> > +#include <Library/FunctionMockLib.h>
> > +extern "C" {
> > +  #include <Base.h>
> > +  #include <Library/FdtLib.h>
> > +}
> > +
> > +struct MockFdtLib {
> > +  MOCK_INTERFACE_DECLARATION (MockFdtLib);
> > +
> > +  MOCK_FUNCTION_DECLARATION (
> > +    UINT16,
> > +    Fdt16ToCpu,
> > +    (IN UINT16 Value)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    UINT16,
> > +    CpuToFdt16,
> > +    (IN UINT16 Value)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    UINT32,
> > +    Fdt32ToCpu,
> > +    (IN UINT32 Value)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    UINT32,
> > +    CpuToFdt32,
> > +    (IN UINT32 Value)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    UINT64,
> > +    Fdt64ToCpu,
> > +    (IN UINT64 Value)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    UINT64,
> > +    CpuToFdt64,
> > +    (IN UINT64 Value)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    INT32,
> > +    FdtCheckHeader,
> > +    (IN CONST VOID  *Fdt)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    INT32,
> > +    FdtCreateEmptyTree,
> > +    (IN VOID    *Buffer,
> > +     IN UINT32  BufferSize)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    INT32,
> > +    FdtNextNode,
> > +    (IN CONST VOID  *Fdt,
> > +     IN INT32       Offset,
> > +     IN INT32       *Depth)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    INT32,
> > +    FdtFirstSubnode,
> > +    (IN CONST VOID  *Fdt,
> > +     IN INT32       Offset)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    INT32,
> > +    FdtNextSubnode,
> > +    (IN CONST VOID  *Fdt,
> > +     IN INT32       Offset)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    INT32,
> > +    FdtSubnodeOffsetNameLen,
> > +    (IN CONST VOID   *Fdt,
> > +     IN INT32        ParentOffset,
> > +     IN CONST CHAR8  *Name,
> > +     IN INT32        NameLength)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    INT32,
> > +    FdtNodeOffsetByPropValue,
> > +    (IN CONST VOID   *Fdt,
> > +     IN INT32        StartOffset,
> > +     IN CONST CHAR8  *PropertyName,
> > +     IN CONST VOID   *PropertyValue,
> > +     IN INT32        PropertyLength)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    CONST FDT_PROPERTY *,
> > +    FdtGetProperty,
> > +    (IN CONST VOID   *Fdt,
> > +     IN INT32        NodeOffset,
> > +     IN CONST CHAR8  *Name,
> > +     IN INT32        *Length)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    INT32,
> > +    FdtFirstPropertyOffset,
> > +    (IN CONST VOID  *Fdt,
> > +     IN INT32       NodeOffset)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    INT32,
> > +    FdtNextPropertyOffset,
> > +    (IN CONST VOID  *Fdt,
> > +     IN INT32       NodeOffset)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    CONST FDT_PROPERTY *,
> > +    FdtGetPropertyByOffset,
> > +    (IN CONST VOID  *Fdt,
> > +     IN INT32       Offset,
> > +     IN INT32       *Length)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    CONST CHAR8 *,
> > +    FdtGetString,
> > +    (IN CONST VOID  *Fdt,
> > +     IN INT32       StrOffset,
> > +     IN INT32       *Length        OPTIONAL)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    INT32,
> > +    FdtAddSubnode,
> > +    (IN VOID         *Fdt,
> > +     IN INT32        ParentOffset,
> > +     IN CONST CHAR8  *Name)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    INT32,
> > +    FdtSetProp,
> > +    (IN VOID         *Fdt,
> > +     IN INT32        NodeOffset,
> > +     IN CONST CHAR8  *Name,
> > +     IN CONST VOID   *Value,
> > +     IN UINT32       Length)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    CONST CHAR8 *,
> > +    FdtGetName,
> > +    (IN VOID    *Fdt,
> > +     IN INT32   NodeOffset,
> > +     IN INT32   *Length)
> > +    );
> > +  MOCK_FUNCTION_DECLARATION (
> > +    INT32,
> > +    FdtNodeDepth,
> > +    (IN CONST VOID  *Fdt,
> > +     IN INT32       NodeOffset)
> > +    );
> > +};
> > +
> > +#endif
> > diff --git
> > a/MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.cpp
> > b/MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.cpp
> > new file mode 100644
> > index 000000000000..a955780d23fe
> > --- /dev/null
> > +++ b/MdePkg/Test/Mock/Library/GoogleTest/MockFdtLib/MockFdtLib.cpp
> > @@ -0,0 +1,34 @@
> > +/** @file
> > +  Google Test mocks for FdtLib
> > +
> > +  Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights
> > reserved.
> > +  Copyright (c) 2023, Intel Corporation. All rights reserved.
> > +  SPDX-License-Identifier: BSD-2-Clause-Patent
> > +**/
> > +
> > +#include <GoogleTest/Library/MockFdtLib.h>
> > +
> > +MOCK_INTERFACE_DEFINITION (MockFdtLib);
> > +
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, Fdt16ToCpu, 1, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, CpuToFdt16, 1, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, Fdt32ToCpu, 1, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, CpuToFdt32, 1, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, Fdt64ToCpu, 1, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, CpuToFdt64, 1, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtCheckHeader, 1, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtCreateEmptyTree, 2, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtNextNode, 3, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtFirstSubnode, 2, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtNextSubnode, 2, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtSubnodeOffsetNameLen, 4,
> > EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtNodeOffsetByPropValue, 5,
> > EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtGetProperty, 4, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtFirstPropertyOffset, 2,
> > EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtNextPropertyOffset, 2,
> > EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtGetPropertyByOffset, 3,
> > EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtGetString, 3, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtAddSubnode, 3, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtSetProp, 5, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtGetName, 3, EFIAPI);
> > +MOCK_FUNCTION_DEFINITION (MockFdtLib, FdtNodeDepth, 2, EFIAPI);
> > --
> > 2.34.1
> >
> >
> >
> > 
> >



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114270): https://edk2.groups.io/g/devel/message/114270
Mute This Topic: https://groups.io/mt/103925152/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: 
https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-


Reply via email to