From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.48598.1606199593209885496 for ; Mon, 23 Nov 2020 22:33:13 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: arvinx.chen@intel.com) IronPort-SDR: 3+TcdMfnU4r8GpWB9cwBwc7wl4Qizl+W6ih3h9oMrHFcUFQ79Y7+QBXd0O5Sl5VvohXzjsEoI/ LSZSmiiMzp8g== X-IronPort-AV: E=McAfee;i="6000,8403,9814"; a="171116557" X-IronPort-AV: E=Sophos;i="5.78,365,1599548400"; d="scan'208";a="171116557" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2020 22:33:12 -0800 IronPort-SDR: DPgWkB1XJA7gxhAIP6sXDypnoJUkJxAliAADM0TzrDR1NvWFkHzaeay5Qym9iQAhD7esF3+sCs sHtphVbhMc6Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,365,1599548400"; d="scan'208";a="327463360" Received: from chiena2x-desk.gar.corp.intel.com ([10.5.245.106]) by orsmga003.jf.intel.com with ESMTP; 23 Nov 2020 22:33:10 -0800 From: "Chen, ArvinX" To: devel@edk2.groups.io Cc: G Edhaya Chandran , Samer El-Haj-Mahmoud , Eric Jin , Heinrich Schuchardt Subject: [PATCH] [edk2-devel] RecordAssertion function parameter issue. Date: Tue, 24 Nov 2020 14:33:06 +0800 Message-Id: <20201124063306.1012-1-arvinx.chen@intel.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3082=0D =0D Correct "RecordAssertion" argument issue to make SCT tool more stable.=0D =0D Cc: G Edhaya Chandran =0D Cc: Samer El-Haj-Mahmoud =0D Cc: Eric Jin =0D Cc: Heinrich Schuchardt =0D Signed-off-by: ArvinX Chen =0D ---=0D .../ProtocolHandlerBBTestFunction_3.c | 8 +++----=0D .../EfiCompliantBBTestPlatform_uefi.c | 2 +-=0D .../AcpiTableProtocolBBTestFunction.c | 2 +-=0D .../BlackBoxTest/BlockIo2BBTestFunction.c | 3 ++-=0D .../ComponentName2BBTestFunction.c | 6 ++---=0D .../ConfigKeywordHandlerBBTestFunction.c | 2 +-=0D .../DevicePathFromTextBBTestCoverage.c | 5 ++--=0D .../DevicePathUtilitiesBBTestConformance.c | 15 ++++++++----=0D .../DriverDiagnostics2BBTestFunction.c | 4 ++--=0D .../EraseBlockBBTestConformance.c | 8 +++----=0D .../GraphicsOutputBBTestFunction.c | 8 ++++---=0D .../BlackBoxTest/HIIFontBBTestConformance.c | 3 +--=0D .../BlackBoxTest/HIIFontExBBTestConformance.c | 3 +--=0D .../BlackBoxTest/HIIImageBBTestConformance.c | 4 ++--=0D .../HIIImageExBBTestConformance.c | 4 ++--=0D .../BlackBoxTest/HIIStringBBTestConformance.c | 3 +--=0D .../BlackBoxTest/Hash2BBTestConformance.c | 23 ++++++++-----------=0D .../IPsecConfigBBTestConformance.c | 8 +++----=0D .../NVMEPassThruBBTestConformance.c | 2 +-=0D .../BlackBoxTest/NVMEPassThruBBTestFunction.c | 6 ++---=0D .../BlackBoxTest/PciIoBBTestFunction_1.c | 5 ++--=0D .../BlackBoxTest/PxeBaseCodeBBTestFunction.c | 2 +-=0D .../RegularExpressionBBTestConformance.c | 2 +-=0D .../SimpleFileSystemBBTestFunction.c | 2 +-=0D .../SimpleFileSystemExBBTestFunction_OpenEx.c | 10 ++++----=0D .../SimpleNetworkBBTestConformance.c | 2 +-=0D .../UFSDeviceConfigBBTestConformance.c | 6 ++---=0D .../VariableServicesBBTestConformance.c | 6 +++--=0D .../BlackBoxTest/BlockIo2BBTestFunction.c | 3 ++-=0D .../ComponentName2BBTestFunction.c | 6 ++---=0D .../DriverDiagnostics2BBTestFunction.c | 4 ++--=0D .../GraphicsOutputBBTestFunction.c | 8 ++++---=0D .../BlackBoxTest/PxeBaseCodeBBTestFunction.c | 2 +-=0D .../SimpleFileSystemBBTestFunction.c | 2 +-=0D .../SimpleFileSystemExBBTestFunction_OpenEx.c | 10 ++++----=0D .../SimpleNetworkBBTestConformance.c | 2 +-=0D 36 files changed, 98 insertions(+), 93 deletions(-)=0D =0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandler= Services/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c b/uefi-sct/SctPkg/T= estCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/Protocol= HandlerBBTestFunction_3.c=0D index 8ad31f7f..94288b23 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerService= s/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerService= s/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c=0D @@ -11672,7 +11672,6 @@ BBTestOpenProtocolInformationInterfaceTestCheckPoin= t1 (=0D L"%a:%d:TPL - %d",=0D __FILE__,=0D (UINTN)__LINE__,=0D - EntryCount,=0D TplArray[Index]=0D );=0D //=0D @@ -11825,7 +11824,6 @@ BBTestOpenProtocolInformationInterfaceTestCheckPoin= t1 (=0D L"%a:%d:TPL - %d",=0D __FILE__,=0D (UINTN)__LINE__,=0D - EntryCount,=0D TplArray[Index]=0D );=0D //=0D @@ -15398,11 +15396,11 @@ BBTestConnectControllerInterfaceTestCheckPoint14 = (=0D EFI_TEST_ASSERTION_FAILED,=0D gTestGenericFailureGuid,=0D L"GetPlatformOverrideDriverImages - build environment",= =0D - L"%a:%d:Status - %r, NoHandles - %d",=0D + L"%a:%d:Status - %r",=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - );=0D + );=0D goto Done;=0D }=0D =0D @@ -15699,7 +15697,7 @@ BBTestConnectControllerInterfaceTestCheckPoint15 (= =0D EFI_TEST_ASSERTION_FAILED,=0D gTestGenericFailureGuid,=0D L"GetPlatformOverrideDriverImages - build environment",= =0D - L"%a:%d:Status - %r, NoHandles - %d",=0D + L"%a:%d:Status - %r",=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBo= xTest/EfiCompliantBBTestPlatform_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI= /Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c=0D index be06d139..1ee50a3f 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/E= fiCompliantBBTestPlatform_uefi.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/E= fiCompliantBBTestPlatform_uefi.c=0D @@ -1017,7 +1017,7 @@ CheckConsoleProtocols (=0D AssertionType,=0D gEfiCompliantBbTestPlatformAssertionGuid001,=0D L"UEFI Compliant - Console protocols must be implemented"= ,=0D - L"%a:%d:Text Input - %s, Text Output - %s, Text InputEx",= =0D + L"%a:%d:Text Input - %s, Text Output - %s, Text InputEx -= %s",=0D __FILE__,=0D (UINTN)__LINE__,=0D ValueA ? L"Yes" : L"No",=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxT= est/AcpiTableProtocolBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/P= rotocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestFunction.c=0D index e1f5ccee..51ce391d 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/Acp= iTableProtocolBBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/Acp= iTableProtocolBBTestFunction.c=0D @@ -303,7 +303,7 @@ BBTestInstallAcpiTableFunctionTestCheckpoint1 (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D if (EFI_SUCCESS =3D=3D Status) {=0D Status =3D AcpiTable->UninstallAcpiTable (=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTe= st/BlockIo2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Bl= ockIo2/BlackBoxTest/BlockIo2BBTestFunction.c=0D index 8ccbfaf2..551f4671 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/Bloc= kIo2BBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/Bloc= kIo2BBTestFunction.c=0D @@ -4686,7 +4686,8 @@ BBTestFushBlocksExFunctionAutoTestCheckpoint1(=0D __FILE__,=0D (UINTN)__LINE__,=0D 4,=0D - EFI_SUCCESS=0D + EFI_SUCCESS,=0D + BlockIo2TokenBuffer[IndexI].TransactionStatus=0D );=0D =0D Status =3D gtBS->SetTimer (TimerEvent, TimerCancel, 0);=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/Blac= kBoxTest/ComponentName2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI= /Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c=0D index 9d5d9ffc..3b653498 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTes= t/ComponentName2BBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTes= t/ComponentName2BBTestFunction.c=0D @@ -766,10 +766,10 @@ BBTestGetControllerNameFuncTestCheckpoint2 (=0D AssertionType,=0D gComponentName2BBTestFunctionAssertionGuid003,=0D L"Please Use Native RFC3066 which is preferable i= n UEFI 2.X\nCOMPONENT_NAME2_PROTOCOL.GetControllerName - GetControllerName(= ) returns EFI_SUCCESS support language",=0D - L"%a:%d: Language - %c%c%c, ControllerIndex - %d,= ChildIndex - %d, ControllerName - %s, Status - %r",=0D - __FILE__,=0D + L"%a:%d: Language - %c%c%c%c, ControllerIndex - %= d, ChildIndex - %d, ControllerName - %s, Status - %r",=0D + __FILE__,=0D (UINTN)__LINE__,=0D - Lang,=0D + Lang[0],Lang[1],Lang[2],Lang[3],=0D Index,=0D ChildIndex,=0D (ControllerName =3D=3D NULL) ? L"(NULL)" : Contro= llerName,=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandle= r/BlackBoxTest/ConfigKeywordHandlerBBTestFunction.c b/uefi-sct/SctPkg/TestC= ase/UEFI/EFI/Protocol/ConfigKeywordHandler/BlackBoxTest/ConfigKeywordHandle= rBBTestFunction.c=0D index 3f44cefa..9061f597 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/Black= BoxTest/ConfigKeywordHandlerBBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/Black= BoxTest/ConfigKeywordHandlerBBTestFunction.c=0D @@ -447,7 +447,7 @@ BBTestGetDataFunctionTest (=0D (UINTN)__LINE__,=0D Status,=0D ProgressErr=0D - ); =0D + );=0D =0D Status =3D ConfigKeywordHandler->GetData (ConfigKeywordHandler, L"NAMESP= ACE=3Dx-UEFI-ns&", KeywordString2, &Progress, &ProgressErr, &Results2);=0D if (Status !=3D EFI_SUCCESS || ProgressErr !=3D KEYWORD_HANDLER_NO_ERROR= || Progress !=3D KeywordString2 + SctStrLen(KeywordString2)) {=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/= BlackBoxTest/DevicePathFromTextBBTestCoverage.c b/uefi-sct/SctPkg/TestCase/= UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestC= overage.c=0D index 5058dc4a..9a7b908a 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBo= xTest/DevicePathFromTextBBTestCoverage.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBo= xTest/DevicePathFromTextBBTestCoverage.c=0D @@ -2233,7 +2233,8 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest= (=0D L"EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL - ConvertDeviceNodeTo= Text must correctly recover the converting ConvertTextToDeviceNode has acte= d on the device node string",=0D L"%a:%d, Convert MemoryMapped(%d,0x123456789ABCDEF,0xFEDCB= A9876543210)",=0D __FILE__,=0D - (UINTN)__LINE__=0D + (UINTN)__LINE__,=0D + EfiMaxMemoryType=0D );=0D =0D //=0D @@ -3414,7 +3415,7 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest= (=0D L"%a:%d, Convert SD(0)",=0D __FILE__,=0D (UINTN)__LINE__=0D - ); =0D + );=0D =0D //=0D // Bluetooth(001320F5FA77) =0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities= /BlackBoxTest/DevicePathUtilitiesBBTestConformance.c b/uefi-sct/SctPkg/Test= Case/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilities= BBTestConformance.c=0D index d8d237a6..32122a78 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackB= oxTest/DevicePathUtilitiesBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackB= oxTest/DevicePathUtilitiesBBTestConformance.c=0D @@ -90,7 +90,8 @@ DevicePathUtilitiesCreateDeviceNodeConformanceTest (=0D L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - CreatDeviceNode sho= uld not succeed with invalid NodeLength set",=0D L"%a:%d:Status - %r",=0D __FILE__,=0D - (UINTN)__LINE__=0D + (UINTN)__LINE__,=0D + Status=0D );=0D =0D return EFI_SUCCESS;=0D @@ -284,7 +285,8 @@ DevicePathUtilitiesAppendDevicePathConformanceTest (=0D L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - SctAppendDevicePath= should ignore Src1 when it is set NULL",=0D L"%a:%d:Status - %r",=0D __FILE__,=0D - (UINTN)__LINE__=0D + (UINTN)__LINE__,=0D + Status=0D );=0D =0D //=0D @@ -326,7 +328,8 @@ DevicePathUtilitiesAppendDevicePathConformanceTest (=0D L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - SctAppendDevicePath= should ignore Src2 when it is set NULL",=0D L"%a:%d:Status - %r",=0D __FILE__,=0D - (UINTN)__LINE__=0D + (UINTN)__LINE__,=0D + Status=0D );=0D =0D pDevicePath1 =3D DevicePathUtilities->AppendDevicePath (NULL, NULL);= =0D @@ -417,7 +420,8 @@ DevicePathUtilitiesAppendDevicePathInstanceConformanceT= est (=0D L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - AppendDevicePathIns= tance should not succeed with DevicePathInstance set to be NULL",=0D L"%a:%d:Status - %r",=0D __FILE__,=0D - (UINTN)__LINE__=0D + (UINTN)__LINE__,=0D + Status=0D );=0D =0D return EFI_SUCCESS;=0D @@ -473,7 +477,8 @@ DevicePathUtilitiesGetNextDevicePathInstanceConformance= Test (=0D L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - GetNextDevicePathIn= stance should not succeed with DevicePathInstance set to be NULL",=0D L"%a:%d:Status - %r",=0D __FILE__,=0D - (UINTN)__LINE__=0D + (UINTN)__LINE__,=0D + Status=0D );=0D =0D return EFI_SUCCESS;=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/= BlackBoxTest/DriverDiagnostics2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/= UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestF= unction.c=0D index 94c0d85f..80b24b2c 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBo= xTest/DriverDiagnostics2BBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBo= xTest/DriverDiagnostics2BBTestFunction.c=0D @@ -685,10 +685,10 @@ BBTestRunDiagnosticsFuncTestCheckpoint2 (=0D AssertionType,=0D gFunctionAssertionGuid002,=0D L"Please Use Native RFC3066 which is preferable i= n UEFI 2.X\nEFI_DRIVER_DIAGNOSTICS2_PROTOCOL.RunDiagnostics - RunDiagnostic= s() returns EFI_SUCCESS with supported language",=0D - L"%a:%d: Language - %c%c%c, ControllerIndex - %d,= ChildIndex - %d, ControllerName - %s, Status - %r",=0D + L"%a:%d: Language - %c%c%c%c, ControllerIndex - %= d, ChildIndex - %d, ControllerName - %s, Status - %r",=0D __FILE__,=0D (UINTN)__LINE__,=0D - Lang,=0D + Lang[0],Lang[1],Lang[2],Lang[3],=0D Index,=0D ChildIndex,=0D (ControllerName =3D=3D NULL) ? L"(NULL)" : Contro= llerName,=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBox= Test/EraseBlockBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Prot= ocol/EraseBlock/BlackBoxTest/EraseBlockBBTestConformance.c=0D index a6156b98..c49db682 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/Er= aseBlockBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/Er= aseBlockBBTestConformance.c=0D @@ -193,7 +193,7 @@ BBTestEraseBlocksConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D } else {=0D Status =3D EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, 0, &Toke= n, EraseSize);=0D @@ -211,7 +211,7 @@ BBTestEraseBlocksConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D Status =3D EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, LastBloc= k + 1, &Token, EraseSize);=0D if (Status =3D=3D EFI_MEDIA_CHANGED)=0D @@ -228,7 +228,7 @@ BBTestEraseBlocksConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D Status =3D EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, LastBloc= k - 10, &Token, EraseSize + 1);=0D if (Status =3D=3D EFI_MEDIA_CHANGED)=0D @@ -245,7 +245,7 @@ BBTestEraseBlocksConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D Status =3D EraseBlock->EraseBlocks(EraseBlock, MediaId, LastBlock + = 1, &Token, EraseSize);=0D if (Status =3D=3D EFI_INVALID_PARAMETER)=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/Blac= kBoxTest/GraphicsOutputBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI= /Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c=0D index f1936755..edde3117 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTes= t/GraphicsOutputBBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTes= t/GraphicsOutputBBTestFunction.c=0D @@ -172,7 +172,7 @@ Returns:=0D AssertionType,=0D gEfiGraphicsOutputQueryModeBBTestFunctionAssertionGui= d,=0D L"EFI_GRAPHICS_OUTPUT_PROTOCOL.QueryMode - SetMode() = then QueryMode(), compare Info structure",=0D - L"%a:%d: Status",=0D + L"%a:%d: Status - %r",=0D (UINTN) __FILE__,=0D (UINTN) (UINTN)__LINE__,=0D Status=0D @@ -753,7 +753,8 @@ Returns:=0D L"%a:%d:Status:%r, Expected:%r",=0D (UINTN) __FILE__,=0D (UINTN) (UINTN)__LINE__,=0D - (UINTN) Status=0D + (UINTN) Status,=0D + EFI_SUCCESS=0D );=0D return Status;=0D }=0D @@ -1474,7 +1475,8 @@ Returns:=0D L"%a:%d:Status:%r, Expected:%r",=0D (UINTN) __FILE__,=0D (UINTN) (UINTN)__LINE__,=0D - (UINTN) Status=0D + (UINTN) Status,=0D + EFI_SUCCESS=0D );=0D continue;=0D }=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTes= t/HIIFontBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/H= IIFont/BlackBoxTest/HIIFontBBTestConformance.c=0D index 911c4a5c..e437f002 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFo= ntBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFo= ntBBTestConformance.c=0D @@ -602,8 +602,7 @@ BBTestStringIdToImageConformanceTestCheckpoint1 (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D -=0D + );=0D //=0D // Call StringIdToImage with StringId not in PackageList, EFI_NOT_FOUND = should be returned.=0D //=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxT= est/HIIFontExBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protoc= ol/HIIFontEx/BlackBoxTest/HIIFontExBBTestConformance.c=0D index d99ceb01..929bae16 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HII= FontExBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HII= FontExBBTestConformance.c=0D @@ -646,8 +646,7 @@ BBTestStringIdToImageExConformanceTestCheckpoint1 (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D -=0D + );=0D //=0D // Call StringIdToImageEx with StringId not in PackageList, EFI_NOT_FOUN= D should be returned.=0D //=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTe= st/HIIImageBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol= /HIIImage/BlackBoxTest/HIIImageBBTestConformance.c=0D index 20b24bc5..7b738c69 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIII= mageBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIII= mageBBTestConformance.c=0D @@ -2333,7 +2333,7 @@ BBTestDrawImageIdConformanceTestCheckpoint1(=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D //=0D // Call DrawImageId with PackageList been NULL=0D @@ -2362,7 +2362,7 @@ BBTestDrawImageIdConformanceTestCheckpoint1(=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D //=0D // Call DrawImageId with invalid ImageId=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBox= Test/HIIImageExBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Prot= ocol/HIIImageEx/BlackBoxTest/HIIImageExBBTestConformance.c=0D index b469bb8c..dc97bfac 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HI= IImageExBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HI= IImageExBBTestConformance.c=0D @@ -2030,7 +2030,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint1(=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D //=0D // Call DrawImageIdEx with PackageList been NULL=0D @@ -2059,7 +2059,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint1(=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D //=0D // Call DrawImageIdEx with invalid ImageId=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxT= est/HIIStringBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protoc= ol/HIIString/BlackBoxTest/HIIStringBBTestConformance.c=0D index ca9ed0b7..07ff28e1 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HII= StringBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HII= StringBBTestConformance.c=0D @@ -607,8 +607,7 @@ BBTestGetStringConformanceTestCheckpoint1 (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D -=0D + );=0D //=0D // Remove the PackageList from the HII database=0D //=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/= Hash2BBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2= /BlackBoxTest/Hash2BBTestConformance.c=0D index a6ae34ee..494e3451 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BB= TestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BB= TestConformance.c=0D @@ -299,7 +299,7 @@ BBTestHashInitConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D =0D Status =3D Hash2->HashInit (Hash2, &gHashAlgorithmGuids[Index]);=0D @@ -320,8 +320,7 @@ BBTestHashInitConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D -=0D + );=0D }=0D }=0D =0D @@ -384,7 +383,7 @@ BBTestHashUpdateConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D for (Index =3D 0; Index < 6; Index++) {=0D Status =3D Hash2->GetHashSize (Hash2, &gHashAlgorithmGuids[Index], &Ha= shSize);=0D @@ -407,7 +406,7 @@ BBTestHashUpdateConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D =0D Status =3D Hash2->HashInit (Hash2, &gHashAlgorithmGuids[Index]);=0D @@ -428,8 +427,7 @@ BBTestHashUpdateConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D -=0D + );=0D }=0D }=0D =0D @@ -492,7 +490,7 @@ BBTestHashFinalConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D for (Index =3D 0; Index < 6; Index++) {=0D Status =3D Hash2->GetHashSize (Hash2, &gHashAlgorithmGuids[Index], &Ha= shSize);=0D @@ -513,7 +511,7 @@ BBTestHashFinalConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D Status =3D Hash2->HashInit (Hash2, &gHashAlgorithmGuids[Index]);=0D Status =3D Hash2->HashUpdate (Hash2, Message, MessageSize);=0D @@ -533,7 +531,7 @@ BBTestHashFinalConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D =0D Status=3D Hash2->HashInit (Hash2, &gHashAlgorithmGuids[Index]);=0D @@ -554,7 +552,7 @@ BBTestHashFinalConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D Status =3D Hash2->HashFinal (Hash2, (EFI_HASH2_OUTPUT *) Hash2Out);= =0D Status =3D Hash2->HashFinal (Hash2, (EFI_HASH2_OUTPUT*) Hash2Out);;= =0D @@ -572,8 +570,7 @@ BBTestHashFinalConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D -=0D + );=0D }=0D }=0D =0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBo= xTest/IPsecConfigBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Pr= otocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestConformance.c=0D index cac04b66..da910ff2 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/I= PsecConfigBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/I= PsecConfigBBTestConformance.c=0D @@ -693,7 +693,7 @@ BBTestGetDataConformanceTestCheckpoint3 (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D //=0D // Clean Environment: Call IPsec->SetData with the same DataType(0)/Sel= ector. =0D @@ -902,7 +902,7 @@ BBTestGetDataConformanceTestCheckpoint4 (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D //=0D // Clean Environment: Call IPsec->SetData with the same DataType(1)/Sel= ector. =0D @@ -1066,7 +1066,7 @@ BBTestGetDataConformanceTestCheckpoint4 (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D //=0D // Clean Environment: Call IPsec->SetData with the same DataType(1)/Sel= ector. =0D @@ -1244,7 +1244,7 @@ BBTestGetDataConformanceTestCheckpoint5 (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D //=0D // Clean Environment: Call IPsec->SetData with the same DataType(2)/Sel= ector. =0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackB= oxTest/NVMEPassThruBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/= Protocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestConformance.c=0D index cb237c00..c89e1f09 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/= NVMEPassThruBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/= NVMEPassThruBBTestConformance.c=0D @@ -405,7 +405,7 @@ BBTestPassThruConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D EFI_UNSUPPORTED=0D - ); =0D + );=0D return EFI_UNSUPPORTED; =0D }=0D =0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackB= oxTest/NVMEPassThruBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Pro= tocol/NVMEPassThru/BlackBoxTest/NVMEPassThruBBTestFunction.c=0D index d4f942e3..5c5a7fc9 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/= NVMEPassThruBBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/= NVMEPassThruBBTestFunction.c=0D @@ -351,7 +351,7 @@ BBTestPassThruFunctionTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D EFI_UNSUPPORTED=0D - ); =0D + );=0D return EFI_UNSUPPORTED; =0D }=0D =0D @@ -390,9 +390,7 @@ BBTestPassThruFunctionTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D -=0D -=0D + );=0D //=0D // Create Event=0D //=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/= PciIoBBTestFunction_1.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/= BlackBoxTest/PciIoBBTestFunction_1.c=0D index d65ece24..457a9108 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBB= TestFunction_1.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBB= TestFunction_1.c=0D @@ -4480,7 +4480,7 @@ IoWrite_Func (=0D //=0D //then read out the data in destination address range.=0D //=0D - PciIo->Io.Read (=0D + Status =3D PciIo->Io.Read (=0D PciIo,=0D PciIoWidth,=0D BarIndex,=0D @@ -4508,7 +4508,8 @@ IoWrite_Func (=0D L"EFI_PCI_IO_PROTOCOL.Io.Write - the data read must e= qual with the data written",=0D L"%a:%d:Status - %r",=0D __FILE__,=0D - (UINTN)__LINE__=0D + (UINTN)__LINE__,=0D + Status=0D );=0D //=0D //write the data using EfiPciIoWidthFifoUintX.=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBo= xTest/PxeBaseCodeBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Proto= col/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c=0D index c1ea0d49..1f2f5305 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/P= xeBaseCodeBBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/P= xeBaseCodeBBTestFunction.c=0D @@ -1252,7 +1252,7 @@ BBTestNewStopFunctionTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D }=0D =0D //=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/B= lackBoxTest/RegularExpressionBBTestConformance.c b/uefi-sct/SctPkg/TestCase= /UEFI/EFI/Protocol/RegularExpression/BlackBoxTest/RegularExpressionBBTestCo= nformance.c=0D index e00d0c7f..01d68299 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBox= Test/RegularExpressionBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBox= Test/RegularExpressionBBTestConformance.c=0D @@ -193,7 +193,7 @@ BBTestGetInfoConformanceTestCheckpoint1 (=0D (UINTN)__LINE__,=0D Status,=0D SyntaxTypeListSize=0D - ); =0D + );=0D =0D //=0D // REGULAR_EXPRESSION_PROTOCOL.GetInfo() with SyntaxTypeListSize =3D NUL= L.=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/Bl= ackBoxTest/SimpleFileSystemBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI= /EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.= c=0D index ed0d8743..f269b7be 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemBBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemBBTestFunction.c=0D @@ -1608,7 +1608,7 @@ BBTestReadOnlyTestCheckPoints (=0D AssertionType,=0D gReadOnlyFileSystemBBTestAssertionGuid005,=0D L"ReadOnly System: Dir SetInfo should return EFI_WRITE_= PROTECTED",=0D - L"%a:%d: Status - %r",=0D + L"%a:%d: Status1 - %r Status2 - %r",=0D __FILE__,=0D (UINTN)__LINE__,=0D Status1,=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/Bl= ackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c b/uefi-sct/SctPkg/Test= Case/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTe= stFunction_OpenEx.c=0D index c2bf9b4f..526ad906 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemExBBTestFunction_OpenEx.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemExBBTestFunction_OpenEx.c=0D @@ -1155,7 +1155,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (=0D EFI_TEST_ASSERTION_FAILED,=0D gSimpleFileSystemExBBTestFunctionAssertionGuid027,=0D L"OpenEx() Basic Test - checkpoint1 ----Test1----Asyn= c",=0D - L"%a:%d: FileIoEntity->Tpl, Status - %r, File Name - = %",=0D + L"%a:%d: FileIoEntity->Tpl - %d, Status - %r, File Na= me - %s",=0D __FILE__,=0D (UINTN)__LINE__,=0D FileIoEntity->Tpl,=0D @@ -2152,7 +2152,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async (=0D EFI_TEST_ASSERTION_FAILED,=0D gSimpleFileSystemExBBTestFunctionAssertionGuid039,=0D L"OpenEx() Basic Test - checkpoint1 ---Async",=0D - L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s"= ,=0D + L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName = - %s",=0D __FILE__,=0D (UINTN)__LINE__,=0D FileIoEntity->Tpl,=0D @@ -2656,7 +2656,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async (=0D EFI_TEST_ASSERTION_FAILED,=0D gSimpleFileSystemExBBTestFunctionAssertionGuid043,=0D L"OpenEx() Basic Test - checkpoint1 ---Async -- Test4= ----Open File",=0D - L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s"= ,=0D + L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName = - %s",=0D __FILE__,=0D (UINTN)__LINE__,=0D FileIoEntity->Tpl,=0D @@ -3302,7 +3302,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async (=0D EFI_TEST_ASSERTION_FAILED,=0D gSimpleFileSystemExBBTestFunctionAssertionGuid047,=0D L"OpenEx() Basic Test - checkpoint1 ---Async -- Test5= ---Open File",=0D - L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s"= ,=0D + L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName = - %s",=0D __FILE__,=0D (UINTN)__LINE__,=0D FileIoEntity->Tpl,=0D @@ -10216,7 +10216,7 @@ BBTestOpenExBasicTestCheckpoint2_Test5_Sync (=0D FileIoEntity->StatusAsync,=0D FileIoEntity->OpenMode,=0D FileIoEntity->Name=0D - ); =0D + );=0D if (FileIoEntity->OpenMode =3D=3D EFI_FILE_MODE_READ){=0D DirHandle2->Open (=0D DirHandle2,=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/Black= BoxTest/SimpleNetworkBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EF= I/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c=0D index 09b47ee6..1b4a0d34 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestConformance.c=0D @@ -1945,7 +1945,7 @@ BBTestTransmitConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D StatusBuf[1]=0D - ); =0D + );=0D =0D StandardLib->RecordAssertion (=0D StandardLib,=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/Bla= ckBoxTest/UFSDeviceConfigBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEF= I/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestConformanc= e.c=0D index 4c8f7c58..b50fc63b 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTe= st/UFSDeviceConfigBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTe= st/UFSDeviceConfigBBTestConformance.c=0D @@ -81,7 +81,7 @@ BBTestRwUfsDescriptorConfTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D Status =3D UFSDeviceConfig->RwUfsDescriptor(UFSDeviceConfig, TRUE, 0, 0,= 0, &Descriptor, NULL);=0D if (Status =3D=3D EFI_INVALID_PARAMETER) =0D @@ -159,7 +159,7 @@ BBTestRwUfsFlagConfTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D Status =3D UFSDeviceConfig->RwUfsFlag(UFSDeviceConfig, TRUE, 1, NULL);=0D if (Status =3D=3D EFI_INVALID_PARAMETER) =0D @@ -237,7 +237,7 @@ BBTestRwUfsAttributeConfTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D =0D Status =3D UFSDeviceConfig->RwUfsAttribute(UFSDeviceConfig, TRUE, 0, 0, = 0, &Attribute, NULL);=0D if (Status =3D=3D EFI_INVALID_PARAMETER) =0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServ= ices/BlackBoxTest/VariableServicesBBTestConformance.c b/uefi-sct/SctPkg/Tes= tCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServic= esBBTestConformance.c=0D index e2182c5c..fb966a87 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/Bl= ackBoxTest/VariableServicesBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/Bl= ackBoxTest/VariableServicesBBTestConformance.c=0D @@ -3653,8 +3653,10 @@ HardwareErrorRecordConfTest (=0D L"RT.SetVariable - Retrive the Hardware Error Record = variables, check the name of them",=0D L"%a:%d:Status - %r, Expected - %r",=0D __FILE__,=0D - (UINTN)__LINE__=0D - ); =0D + (UINTN)__LINE__,=0D + Status,=0D + EFI_SUCCESS=0D + );=0D =0D =0D if (AssertionType =3D=3D EFI_TEST_ASSERTION_FAILED)=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTe= st/BlockIo2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/Bl= ockIo2/BlackBoxTest/BlockIo2BBTestFunction.c=0D index 634246fc..21cf40f9 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/Bloc= kIo2BBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/Bloc= kIo2BBTestFunction.c=0D @@ -4688,7 +4688,8 @@ BBTestFushBlocksExFunctionAutoTestCheckpoint1(=0D __FILE__,=0D (UINTN)__LINE__,=0D 4,=0D - EFI_SUCCESS=0D + EFI_SUCCESS,=0D + BlockIo2TokenBuffer[IndexI].TransactionStatus=0D );=0D =0D Status =3D gtBS->SetTimer (TimerEvent, TimerCancel, 0);=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/Blac= kBoxTest/ComponentName2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV= /Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c=0D index 7b0cc6fc..000ad8f2 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTes= t/ComponentName2BBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTes= t/ComponentName2BBTestFunction.c=0D @@ -718,10 +718,10 @@ BBTestGetControllerNameFuncTestCheckpoint2 (=0D AssertionType,=0D gComponentName2BBTestFunctionAssertionGuid003,=0D L"Please Use Native RFC3066 which is preferable i= n UEFI 2.X\nCOMPONENT_NAME2_PROTOCOL.GetControllerName - GetControllerName(= ) returns EFI_SUCCESS support language",=0D - L"%a:%d: Language - %c%c%c, ControllerIndex - %d,= ChildIndex - %d, ControllerName - %s, Status - %r",=0D - __FILE__,=0D + L"%a:%d: Language - %c%c%c%c, ControllerIndex - %= d, ChildIndex - %d, ControllerName - %s, Status - %r",=0D + __FILE__,=0D (UINTN)__LINE__,=0D - Lang,=0D + Lang[0],Lang[1],Lang[2],Lang[3],=0D Index,=0D ChildIndex,=0D (ControllerName =3D=3D NULL) ? L"(NULL)" : Contro= llerName,=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/= BlackBoxTest/DriverDiagnostics2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/= UEFI/IHV/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestF= unction.c=0D index 4b4988ec..3d1c6ffe 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBo= xTest/DriverDiagnostics2BBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBo= xTest/DriverDiagnostics2BBTestFunction.c=0D @@ -660,10 +660,10 @@ BBTestRunDiagnosticsFuncTestCheckpoint2 (=0D AssertionType,=0D gFunctionAssertionGuid002,=0D L"Please Use Native RFC3066 which is preferable i= n UEFI 2.X\nEFI_DRIVER_DIAGNOSTICS2_PROTOCOL.RunDiagnostics - RunDiagnostic= s() returns EFI_SUCCESS with supported language",=0D - L"%a:%d: Language - %c%c%c, ControllerIndex - %d,= ChildIndex - %d, ControllerName - %s, Status - %r",=0D + L"%a:%d: Language - %c%c%c%c, ControllerIndex - %= d, ChildIndex - %d, ControllerName - %s, Status - %r",=0D __FILE__,=0D (UINTN)__LINE__,=0D - Lang,=0D + Lang[0],Lang[1],Lang[2],Lang[3],=0D Index,=0D ChildIndex,=0D (ControllerName =3D=3D NULL) ? L"(NULL)" : Contro= llerName,=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/Blac= kBoxTest/GraphicsOutputBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV= /Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c=0D index d182ea69..9c3d2bad 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/BlackBoxTes= t/GraphicsOutputBBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/BlackBoxTes= t/GraphicsOutputBBTestFunction.c=0D @@ -171,7 +171,7 @@ Returns:=0D AssertionType,=0D gEfiGraphicsOutputQueryModeBBTestFunctionAssertionGui= d,=0D L"EFI_GRAPHICS_OUTPUT_PROTOCOL.QueryMode - SetMode() = then QueryMode(), compare Info structure",=0D - L"%a:%d: Status",=0D + L"%a:%d: Status - %r",=0D (UINTN) __FILE__,=0D (UINTN) (UINTN)__LINE__,=0D Status=0D @@ -752,7 +752,8 @@ Returns:=0D L"%a:%d:Status:%r, Expected:%r",=0D (UINTN) __FILE__,=0D (UINTN) (UINTN)__LINE__,=0D - (UINTN) Status=0D + (UINTN) Status,=0D + EFI_SUCCESS=0D );=0D return Status;=0D }=0D @@ -1473,7 +1474,8 @@ Returns:=0D L"%a:%d:Status:%r, Expected:%r",=0D (UINTN) __FILE__,=0D (UINTN) (UINTN)__LINE__,=0D - (UINTN) Status=0D + (UINTN) Status,=0D + EFI_SUCCESS=0D );=0D continue;=0D }=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBo= xTest/PxeBaseCodeBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Proto= col/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c=0D index 27994144..51ac332c 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/P= xeBaseCodeBBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/P= xeBaseCodeBBTestFunction.c=0D @@ -1252,7 +1252,7 @@ BBTestNewStopFunctionTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D Status=0D - ); =0D + );=0D }=0D =0D //=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/Bl= ackBoxTest/SimpleFileSystemBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI= /IHV/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.= c=0D index ed0d8743..21629c76 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemBBTestFunction.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemBBTestFunction.c=0D @@ -1608,7 +1608,7 @@ BBTestReadOnlyTestCheckPoints (=0D AssertionType,=0D gReadOnlyFileSystemBBTestAssertionGuid005,=0D L"ReadOnly System: Dir SetInfo should return EFI_WRITE_= PROTECTED",=0D - L"%a:%d: Status - %r",=0D + L"%a:%d: Status1 - %r, Status2 - %r",=0D __FILE__,=0D (UINTN)__LINE__,=0D Status1,=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/Bl= ackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c b/uefi-sct/SctPkg/Test= Case/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTe= stFunction_OpenEx.c=0D index 70ec88f1..aaa34ef9 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemExBBTestFunction_OpenEx.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemExBBTestFunction_OpenEx.c=0D @@ -1155,7 +1155,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (=0D EFI_TEST_ASSERTION_FAILED,=0D gSimpleFileSystemExBBTestFunctionAssertionGuid027,=0D L"OpenEx() Basic Test - checkpoint1 ----Test1----Asyn= c",=0D - L"%a:%d: FileIoEntity->Tpl, Status - %r, File Name - = %",=0D + L"%a:%d: FileIoEntity->Tpl - %d, Status - %r, File Na= me - %",=0D __FILE__,=0D (UINTN)__LINE__,=0D FileIoEntity->Tpl,=0D @@ -2152,7 +2152,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async (=0D EFI_TEST_ASSERTION_FAILED,=0D gSimpleFileSystemExBBTestFunctionAssertionGuid039,=0D L"OpenEx() Basic Test - checkpoint1 ---Async",=0D - L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s"= ,=0D + L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName = - %s",=0D __FILE__,=0D (UINTN)__LINE__,=0D FileIoEntity->Tpl,=0D @@ -2656,7 +2656,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async (=0D EFI_TEST_ASSERTION_FAILED,=0D gSimpleFileSystemExBBTestFunctionAssertionGuid043,=0D L"OpenEx() Basic Test - checkpoint1 ---Async -- Test4= ----Open File",=0D - L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s"= ,=0D + L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName = - %s",=0D __FILE__,=0D (UINTN)__LINE__,=0D FileIoEntity->Tpl,=0D @@ -3302,7 +3302,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async (=0D EFI_TEST_ASSERTION_FAILED,=0D gSimpleFileSystemExBBTestFunctionAssertionGuid047,=0D L"OpenEx() Basic Test - checkpoint1 ---Async -- Test5= ---Open File",=0D - L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s"= ,=0D + L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName = - %s",=0D __FILE__,=0D (UINTN)__LINE__,=0D FileIoEntity->Tpl,=0D @@ -10216,7 +10216,7 @@ BBTestOpenExBasicTestCheckpoint2_Test5_Sync (=0D FileIoEntity->StatusAsync,=0D FileIoEntity->OpenMode,=0D FileIoEntity->Name=0D - ); =0D + );=0D if (FileIoEntity->OpenMode =3D=3D EFI_FILE_MODE_READ){=0D DirHandle2->Open (=0D DirHandle2,=0D diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/Black= BoxTest/SimpleNetworkBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/IH= V/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c=0D index 682076ea..175fe11e 100644=0D --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestConformance.c=0D +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestConformance.c=0D @@ -1945,7 +1945,7 @@ BBTestTransmitConformanceTest (=0D __FILE__,=0D (UINTN)__LINE__,=0D StatusBuf[1]=0D - ); =0D + );=0D =0D StandardLib->RecordAssertion (=0D StandardLib,=0D -- =0D 2.28.0.windows.1=0D =0D