From nobody Sat May 4 09:05:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67870+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67870+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1606199594; cv=none; d=zohomail.com; s=zohoarc; b=Tj8d3qTIHgxTD6qsMfY0DJHuwUPXkpQTnhpNT7BtnUL05Bu1NhpEoXNXR/AxGWR7nmql8DdRRyIfMT3wTuYl2YGQozK6T/weRNFAcnug2JedFUR7GM79lxlSYyktmx7az1/5+ZF4E+KkLmpwmsO0c4OSg7b+1VMefBsrWcjYc44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606199594; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=2xyZ6si2nIhfpajsMo4kqqYJ1qeU1IuPY9h1P2IoWuQ=; b=A5EpUyC+/b78JPm0N3O1iTph4yP0ccNeWimZ4UP/l4WZb+lwMkaNyNVkmiMvfHLy/bRlXGrds8y7I+N1xvUkiKtemBzqYqyXLxg8UHvSCe4WIWam6pML+RYxdEbVqyJVkRALq1yO4/M1I1UvlCh0FM5ONL4wAXcldl5Ij9VR5uk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67870+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1606199594231475.8108303447217; Mon, 23 Nov 2020 22:33:14 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id mzG3YY1788612x9NiE5dl8M9; Mon, 23 Nov 2020 22:33:13 -0800 X-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 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 X-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" X-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> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,arvinx.chen@intel.com X-Gm-Message-State: YjN2KbCsSdDJ7sMB5ly2yvMOx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1606199593; bh=vNqnJFb7Xb96j2dreJ7tqOhXUsyfQy5+BDslU67BJs8=; h=Cc:Date:From:Reply-To:Subject:To; b=urxmaDN29wDiHXrcGGoHy4GJtQDi75OEIkvlHOoOEgX1ydtUvCQkCVrrBwmOqNV7jlm 4NK/dqDDJ+0fw1PjAYi0PgoSfDrj3TfeUoIPelHntmVBFH4HR5Yko+JkgubS4+NDzYvlf FrbuZjVQH9QRKya5aChckS7SAOpXdCmD2TE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3082 Correct "RecordAssertion" argument issue to make SCT tool more stable. Cc: G Edhaya Chandran Cc: Samer El-Haj-Mahmoud Cc: Eric Jin Cc: Heinrich Schuchardt Signed-off-by: ArvinX Chen --- .../ProtocolHandlerBBTestFunction_3.c | 8 +++---- .../EfiCompliantBBTestPlatform_uefi.c | 2 +- .../AcpiTableProtocolBBTestFunction.c | 2 +- .../BlackBoxTest/BlockIo2BBTestFunction.c | 3 ++- .../ComponentName2BBTestFunction.c | 6 ++--- .../ConfigKeywordHandlerBBTestFunction.c | 2 +- .../DevicePathFromTextBBTestCoverage.c | 5 ++-- .../DevicePathUtilitiesBBTestConformance.c | 15 ++++++++---- .../DriverDiagnostics2BBTestFunction.c | 4 ++-- .../EraseBlockBBTestConformance.c | 8 +++---- .../GraphicsOutputBBTestFunction.c | 8 ++++--- .../BlackBoxTest/HIIFontBBTestConformance.c | 3 +-- .../BlackBoxTest/HIIFontExBBTestConformance.c | 3 +-- .../BlackBoxTest/HIIImageBBTestConformance.c | 4 ++-- .../HIIImageExBBTestConformance.c | 4 ++-- .../BlackBoxTest/HIIStringBBTestConformance.c | 3 +-- .../BlackBoxTest/Hash2BBTestConformance.c | 23 ++++++++----------- .../IPsecConfigBBTestConformance.c | 8 +++---- .../NVMEPassThruBBTestConformance.c | 2 +- .../BlackBoxTest/NVMEPassThruBBTestFunction.c | 6 ++--- .../BlackBoxTest/PciIoBBTestFunction_1.c | 5 ++-- .../BlackBoxTest/PxeBaseCodeBBTestFunction.c | 2 +- .../RegularExpressionBBTestConformance.c | 2 +- .../SimpleFileSystemBBTestFunction.c | 2 +- .../SimpleFileSystemExBBTestFunction_OpenEx.c | 10 ++++---- .../SimpleNetworkBBTestConformance.c | 2 +- .../UFSDeviceConfigBBTestConformance.c | 6 ++--- .../VariableServicesBBTestConformance.c | 6 +++-- .../BlackBoxTest/BlockIo2BBTestFunction.c | 3 ++- .../ComponentName2BBTestFunction.c | 6 ++--- .../DriverDiagnostics2BBTestFunction.c | 4 ++-- .../GraphicsOutputBBTestFunction.c | 8 ++++--- .../BlackBoxTest/PxeBaseCodeBBTestFunction.c | 2 +- .../SimpleFileSystemBBTestFunction.c | 2 +- .../SimpleFileSystemExBBTestFunction_OpenEx.c | 10 ++++---- .../SimpleNetworkBBTestConformance.c | 2 +- 36 files changed, 98 insertions(+), 93 deletions(-) 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 index 8ad31f7f..94288b23 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerService= s/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerService= s/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c @@ -11672,7 +11672,6 @@ BBTestOpenProtocolInformationInterfaceTestCheckPoin= t1 ( L"%a:%d:TPL - %d", __FILE__, (UINTN)__LINE__, - EntryCount, TplArray[Index] ); // @@ -11825,7 +11824,6 @@ BBTestOpenProtocolInformationInterfaceTestCheckPoin= t1 ( L"%a:%d:TPL - %d", __FILE__, (UINTN)__LINE__, - EntryCount, TplArray[Index] ); // @@ -15398,11 +15396,11 @@ BBTestConnectControllerInterfaceTestCheckPoint14 ( EFI_TEST_ASSERTION_FAILED, gTestGenericFailureGuid, L"GetPlatformOverrideDriverImages - build environment", - L"%a:%d:Status - %r, NoHandles - %d", + L"%a:%d:Status - %r", __FILE__, (UINTN)__LINE__, Status - ); + ); goto Done; } =20 @@ -15699,7 +15697,7 @@ BBTestConnectControllerInterfaceTestCheckPoint15 ( EFI_TEST_ASSERTION_FAILED, gTestGenericFailureGuid, L"GetPlatformOverrideDriverImages - build environment", - L"%a:%d:Status - %r, NoHandles - %d", + L"%a:%d:Status - %r", __FILE__, (UINTN)__LINE__, Status 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 index be06d139..1ee50a3f 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/E= fiCompliantBBTestPlatform_uefi.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/E= fiCompliantBBTestPlatform_uefi.c @@ -1017,7 +1017,7 @@ CheckConsoleProtocols ( AssertionType, gEfiCompliantBbTestPlatformAssertionGuid001, L"UEFI Compliant - Console protocols must be implemented", - L"%a:%d:Text Input - %s, Text Output - %s, Text InputEx", + L"%a:%d:Text Input - %s, Text Output - %s, Text InputEx -= %s", __FILE__, (UINTN)__LINE__, ValueA ? L"Yes" : L"No", 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 index e1f5ccee..51ce391d 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/Acp= iTableProtocolBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/Acp= iTableProtocolBBTestFunction.c @@ -303,7 +303,7 @@ BBTestInstallAcpiTableFunctionTestCheckpoint1 ( __FILE__, (UINTN)__LINE__, Status - );=20 + ); =20 if (EFI_SUCCESS =3D=3D Status) { Status =3D AcpiTable->UninstallAcpiTable ( 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 index 8ccbfaf2..551f4671 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/Bloc= kIo2BBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/Bloc= kIo2BBTestFunction.c @@ -4686,7 +4686,8 @@ BBTestFushBlocksExFunctionAutoTestCheckpoint1( __FILE__, (UINTN)__LINE__, 4, - EFI_SUCCESS + EFI_SUCCESS, + BlockIo2TokenBuffer[IndexI].TransactionStatus ); =20 Status =3D gtBS->SetTimer (TimerEvent, TimerCancel, 0); 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 index 9d5d9ffc..3b653498 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTes= t/ComponentName2BBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTes= t/ComponentName2BBTestFunction.c @@ -766,10 +766,10 @@ BBTestGetControllerNameFuncTestCheckpoint2 ( AssertionType, gComponentName2BBTestFunctionAssertionGuid003, L"Please Use Native RFC3066 which is preferable i= n UEFI 2.X\nCOMPONENT_NAME2_PROTOCOL.GetControllerName - GetControllerName(= ) returns EFI_SUCCESS support language", - L"%a:%d: Language - %c%c%c, ControllerIndex - %d,= ChildIndex - %d, ControllerName - %s, Status - %r", - __FILE__, + L"%a:%d: Language - %c%c%c%c, ControllerIndex - %= d, ChildIndex - %d, ControllerName - %s, Status - %r", + __FILE__, (UINTN)__LINE__, - Lang, + Lang[0],Lang[1],Lang[2],Lang[3], Index, ChildIndex, (ControllerName =3D=3D NULL) ? L"(NULL)" : Contro= llerName, 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 index 3f44cefa..9061f597 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/Black= BoxTest/ConfigKeywordHandlerBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ConfigKeywordHandler/Black= BoxTest/ConfigKeywordHandlerBBTestFunction.c @@ -447,7 +447,7 @@ BBTestGetDataFunctionTest ( (UINTN)__LINE__, Status, ProgressErr - ); =20 + ); =20 Status =3D ConfigKeywordHandler->GetData (ConfigKeywordHandler, L"NAMESP= ACE=3Dx-UEFI-ns&", KeywordString2, &Progress, &ProgressErr, &Results2); if (Status !=3D EFI_SUCCESS || ProgressErr !=3D KEYWORD_HANDLER_NO_ERROR= || Progress !=3D KeywordString2 + SctStrLen(KeywordString2)) { 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 index 5058dc4a..9a7b908a 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBo= xTest/DevicePathFromTextBBTestCoverage.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBo= xTest/DevicePathFromTextBBTestCoverage.c @@ -2233,7 +2233,8 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest= ( L"EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL - ConvertDeviceNodeTo= Text must correctly recover the converting ConvertTextToDeviceNode has acte= d on the device node string", L"%a:%d, Convert MemoryMapped(%d,0x123456789ABCDEF,0xFEDCB= A9876543210)", __FILE__, - (UINTN)__LINE__ + (UINTN)__LINE__, + EfiMaxMemoryType ); =20 // @@ -3414,7 +3415,7 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest= ( L"%a:%d, Convert SD(0)", __FILE__, (UINTN)__LINE__ - ); =20 + ); =20 // // Bluetooth(001320F5FA77)=20 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 index d8d237a6..32122a78 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackB= oxTest/DevicePathUtilitiesBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackB= oxTest/DevicePathUtilitiesBBTestConformance.c @@ -90,7 +90,8 @@ DevicePathUtilitiesCreateDeviceNodeConformanceTest ( L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - CreatDeviceNode sho= uld not succeed with invalid NodeLength set", L"%a:%d:Status - %r", __FILE__, - (UINTN)__LINE__ + (UINTN)__LINE__, + Status ); =20 return EFI_SUCCESS; @@ -284,7 +285,8 @@ DevicePathUtilitiesAppendDevicePathConformanceTest ( L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - SctAppendDevicePath= should ignore Src1 when it is set NULL", L"%a:%d:Status - %r", __FILE__, - (UINTN)__LINE__ + (UINTN)__LINE__, + Status ); =20 // @@ -326,7 +328,8 @@ DevicePathUtilitiesAppendDevicePathConformanceTest ( L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - SctAppendDevicePath= should ignore Src2 when it is set NULL", L"%a:%d:Status - %r", __FILE__, - (UINTN)__LINE__ + (UINTN)__LINE__, + Status ); =20 pDevicePath1 =3D DevicePathUtilities->AppendDevicePath (NULL, NULL); @@ -417,7 +420,8 @@ DevicePathUtilitiesAppendDevicePathInstanceConformanceT= est ( L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - AppendDevicePathIns= tance should not succeed with DevicePathInstance set to be NULL", L"%a:%d:Status - %r", __FILE__, - (UINTN)__LINE__ + (UINTN)__LINE__, + Status ); =20 return EFI_SUCCESS; @@ -473,7 +477,8 @@ DevicePathUtilitiesGetNextDevicePathInstanceConformance= Test ( L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - GetNextDevicePathIn= stance should not succeed with DevicePathInstance set to be NULL", L"%a:%d:Status - %r", __FILE__, - (UINTN)__LINE__ + (UINTN)__LINE__, + Status ); =20 return EFI_SUCCESS; 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 index 94c0d85f..80b24b2c 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBo= xTest/DriverDiagnostics2BBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBo= xTest/DriverDiagnostics2BBTestFunction.c @@ -685,10 +685,10 @@ BBTestRunDiagnosticsFuncTestCheckpoint2 ( AssertionType, gFunctionAssertionGuid002, 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", - L"%a:%d: Language - %c%c%c, ControllerIndex - %d,= ChildIndex - %d, ControllerName - %s, Status - %r", + L"%a:%d: Language - %c%c%c%c, ControllerIndex - %= d, ChildIndex - %d, ControllerName - %s, Status - %r", __FILE__, (UINTN)__LINE__, - Lang, + Lang[0],Lang[1],Lang[2],Lang[3], Index, ChildIndex, (ControllerName =3D=3D NULL) ? L"(NULL)" : Contro= llerName, 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 index a6156b98..c49db682 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/Er= aseBlockBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/Er= aseBlockBBTestConformance.c @@ -193,7 +193,7 @@ BBTestEraseBlocksConformanceTest ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 } else { Status =3D EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, 0, &Toke= n, EraseSize); @@ -211,7 +211,7 @@ BBTestEraseBlocksConformanceTest ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 Status =3D EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, LastBloc= k + 1, &Token, EraseSize); if (Status =3D=3D EFI_MEDIA_CHANGED) @@ -228,7 +228,7 @@ BBTestEraseBlocksConformanceTest ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 Status =3D EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, LastBloc= k - 10, &Token, EraseSize + 1); if (Status =3D=3D EFI_MEDIA_CHANGED) @@ -245,7 +245,7 @@ BBTestEraseBlocksConformanceTest ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 Status =3D EraseBlock->EraseBlocks(EraseBlock, MediaId, LastBlock + = 1, &Token, EraseSize); if (Status =3D=3D EFI_INVALID_PARAMETER) 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 index f1936755..edde3117 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTes= t/GraphicsOutputBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTes= t/GraphicsOutputBBTestFunction.c @@ -172,7 +172,7 @@ Returns: AssertionType, gEfiGraphicsOutputQueryModeBBTestFunctionAssertionGui= d, L"EFI_GRAPHICS_OUTPUT_PROTOCOL.QueryMode - SetMode() = then QueryMode(), compare Info structure", - L"%a:%d: Status", + L"%a:%d: Status - %r", (UINTN) __FILE__, (UINTN) (UINTN)__LINE__, Status @@ -753,7 +753,8 @@ Returns: L"%a:%d:Status:%r, Expected:%r", (UINTN) __FILE__, (UINTN) (UINTN)__LINE__, - (UINTN) Status + (UINTN) Status, + EFI_SUCCESS ); return Status; } @@ -1474,7 +1475,8 @@ Returns: L"%a:%d:Status:%r, Expected:%r", (UINTN) __FILE__, (UINTN) (UINTN)__LINE__, - (UINTN) Status + (UINTN) Status, + EFI_SUCCESS ); continue; } 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 index 911c4a5c..e437f002 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFo= ntBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFo= ntBBTestConformance.c @@ -602,8 +602,7 @@ BBTestStringIdToImageConformanceTestCheckpoint1 ( __FILE__, (UINTN)__LINE__, Status - ); =20 - + ); // // Call StringIdToImage with StringId not in PackageList, EFI_NOT_FOUND = should be returned. // 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 index d99ceb01..929bae16 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HII= FontExBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFontEx/BlackBoxTest/HII= FontExBBTestConformance.c @@ -646,8 +646,7 @@ BBTestStringIdToImageExConformanceTestCheckpoint1 ( __FILE__, (UINTN)__LINE__, Status - ); =20 - + ); // // Call StringIdToImageEx with StringId not in PackageList, EFI_NOT_FOUN= D should be returned. // 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 index 20b24bc5..7b738c69 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIII= mageBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIII= mageBBTestConformance.c @@ -2333,7 +2333,7 @@ BBTestDrawImageIdConformanceTestCheckpoint1( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 // // Call DrawImageId with PackageList been NULL @@ -2362,7 +2362,7 @@ BBTestDrawImageIdConformanceTestCheckpoint1( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 // // Call DrawImageId with invalid ImageId 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 index b469bb8c..dc97bfac 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HI= IImageExBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImageEx/BlackBoxTest/HI= IImageExBBTestConformance.c @@ -2030,7 +2030,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint1( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 // // Call DrawImageIdEx with PackageList been NULL @@ -2059,7 +2059,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint1( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 // // Call DrawImageIdEx with invalid ImageId 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 index ca9ed0b7..07ff28e1 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HII= StringBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HII= StringBBTestConformance.c @@ -607,8 +607,7 @@ BBTestGetStringConformanceTestCheckpoint1 ( __FILE__, (UINTN)__LINE__, Status - ); =20 - + ); // // Remove the PackageList from the HII database // 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 index a6ae34ee..494e3451 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BB= TestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Hash2/BlackBoxTest/Hash2BB= TestConformance.c @@ -299,7 +299,7 @@ BBTestHashInitConformanceTest ( __FILE__, (UINTN)__LINE__, Status - );=20 + ); =20 =20 Status =3D Hash2->HashInit (Hash2, &gHashAlgorithmGuids[Index]); @@ -320,8 +320,7 @@ BBTestHashInitConformanceTest ( __FILE__, (UINTN)__LINE__, Status - );=20 - + ); } } =20 @@ -384,7 +383,7 @@ BBTestHashUpdateConformanceTest ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 for (Index =3D 0; Index < 6; Index++) { Status =3D Hash2->GetHashSize (Hash2, &gHashAlgorithmGuids[Index], &Ha= shSize); @@ -407,7 +406,7 @@ BBTestHashUpdateConformanceTest ( __FILE__, (UINTN)__LINE__, Status - );=20 + ); =20 =20 Status =3D Hash2->HashInit (Hash2, &gHashAlgorithmGuids[Index]); @@ -428,8 +427,7 @@ BBTestHashUpdateConformanceTest ( __FILE__, (UINTN)__LINE__, Status - );=20 - + ); } } =20 @@ -492,7 +490,7 @@ BBTestHashFinalConformanceTest ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 for (Index =3D 0; Index < 6; Index++) { Status =3D Hash2->GetHashSize (Hash2, &gHashAlgorithmGuids[Index], &Ha= shSize); @@ -513,7 +511,7 @@ BBTestHashFinalConformanceTest ( __FILE__, (UINTN)__LINE__, Status - );=20 + ); =20 Status =3D Hash2->HashInit (Hash2, &gHashAlgorithmGuids[Index]); Status =3D Hash2->HashUpdate (Hash2, Message, MessageSize); @@ -533,7 +531,7 @@ BBTestHashFinalConformanceTest ( __FILE__, (UINTN)__LINE__, Status - );=20 + ); =20 =20 Status=3D Hash2->HashInit (Hash2, &gHashAlgorithmGuids[Index]); @@ -554,7 +552,7 @@ BBTestHashFinalConformanceTest ( __FILE__, (UINTN)__LINE__, Status - );=20 + ); =20 Status =3D Hash2->HashFinal (Hash2, (EFI_HASH2_OUTPUT *) Hash2Out); Status =3D Hash2->HashFinal (Hash2, (EFI_HASH2_OUTPUT*) Hash2Out);; @@ -572,8 +570,7 @@ BBTestHashFinalConformanceTest ( __FILE__, (UINTN)__LINE__, Status - );=20 - + ); } } =20 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 index cac04b66..da910ff2 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/I= PsecConfigBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/I= PsecConfigBBTestConformance.c @@ -693,7 +693,7 @@ BBTestGetDataConformanceTestCheckpoint3 ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 // // Clean Environment: Call IPsec->SetData with the same DataType(0)/Sel= ector. =20 @@ -902,7 +902,7 @@ BBTestGetDataConformanceTestCheckpoint4 ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 // // Clean Environment: Call IPsec->SetData with the same DataType(1)/Sel= ector. =20 @@ -1066,7 +1066,7 @@ BBTestGetDataConformanceTestCheckpoint4 ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 // // Clean Environment: Call IPsec->SetData with the same DataType(1)/Sel= ector. =20 @@ -1244,7 +1244,7 @@ BBTestGetDataConformanceTestCheckpoint5 ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 // // Clean Environment: Call IPsec->SetData with the same DataType(2)/Sel= ector. =20 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 index cb237c00..c89e1f09 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/= NVMEPassThruBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/= NVMEPassThruBBTestConformance.c @@ -405,7 +405,7 @@ BBTestPassThruConformanceTest ( __FILE__, (UINTN)__LINE__, EFI_UNSUPPORTED - );=20 + ); return EFI_UNSUPPORTED;=20 } =20 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 index d4f942e3..5c5a7fc9 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/= NVMEPassThruBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/NVMEPassThru/BlackBoxTest/= NVMEPassThruBBTestFunction.c @@ -351,7 +351,7 @@ BBTestPassThruFunctionTest ( __FILE__, (UINTN)__LINE__, EFI_UNSUPPORTED - );=20 + ); return EFI_UNSUPPORTED;=20 } =09 @@ -390,9 +390,7 @@ BBTestPassThruFunctionTest ( __FILE__, (UINTN)__LINE__, Status - ); =20 - - + ); // // Create Event // 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 index d65ece24..457a9108 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBB= TestFunction_1.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBB= TestFunction_1.c @@ -4480,7 +4480,7 @@ IoWrite_Func ( // //then read out the data in destination address range. // - PciIo->Io.Read ( + Status =3D PciIo->Io.Read ( PciIo, PciIoWidth, BarIndex, @@ -4508,7 +4508,8 @@ IoWrite_Func ( L"EFI_PCI_IO_PROTOCOL.Io.Write - the data read must e= qual with the data written", L"%a:%d:Status - %r", __FILE__, - (UINTN)__LINE__ + (UINTN)__LINE__, + Status ); // //write the data using EfiPciIoWidthFifoUintX. 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 index c1ea0d49..1f2f5305 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/P= xeBaseCodeBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/P= xeBaseCodeBBTestFunction.c @@ -1252,7 +1252,7 @@ BBTestNewStopFunctionTest ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); } =20 // 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 index e00d0c7f..01d68299 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBox= Test/RegularExpressionBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/RegularExpression/BlackBox= Test/RegularExpressionBBTestConformance.c @@ -193,7 +193,7 @@ BBTestGetInfoConformanceTestCheckpoint1 ( (UINTN)__LINE__, Status, SyntaxTypeListSize - ); =20 + ); =20 // // REGULAR_EXPRESSION_PROTOCOL.GetInfo() with SyntaxTypeListSize =3D NUL= L. 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 index ed0d8743..f269b7be 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemBBTestFunction.c @@ -1608,7 +1608,7 @@ BBTestReadOnlyTestCheckPoints ( AssertionType, gReadOnlyFileSystemBBTestAssertionGuid005, L"ReadOnly System: Dir SetInfo should return EFI_WRITE_= PROTECTED", - L"%a:%d: Status - %r", + L"%a:%d: Status1 - %r Status2 - %r", __FILE__, (UINTN)__LINE__, Status1, 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 index c2bf9b4f..526ad906 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemExBBTestFunction_OpenEx.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemExBBTestFunction_OpenEx.c @@ -1155,7 +1155,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async ( EFI_TEST_ASSERTION_FAILED, gSimpleFileSystemExBBTestFunctionAssertionGuid027, L"OpenEx() Basic Test - checkpoint1 ----Test1----Asyn= c", - L"%a:%d: FileIoEntity->Tpl, Status - %r, File Name - = %", + L"%a:%d: FileIoEntity->Tpl - %d, Status - %r, File Na= me - %s", __FILE__, (UINTN)__LINE__, FileIoEntity->Tpl, @@ -2152,7 +2152,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async ( EFI_TEST_ASSERTION_FAILED, gSimpleFileSystemExBBTestFunctionAssertionGuid039, L"OpenEx() Basic Test - checkpoint1 ---Async", - L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s", + L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName = - %s", __FILE__, (UINTN)__LINE__, FileIoEntity->Tpl, @@ -2656,7 +2656,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async ( EFI_TEST_ASSERTION_FAILED, gSimpleFileSystemExBBTestFunctionAssertionGuid043, L"OpenEx() Basic Test - checkpoint1 ---Async -- Test4= ----Open File", - L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s", + L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName = - %s", __FILE__, (UINTN)__LINE__, FileIoEntity->Tpl, @@ -3302,7 +3302,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async ( EFI_TEST_ASSERTION_FAILED, gSimpleFileSystemExBBTestFunctionAssertionGuid047, L"OpenEx() Basic Test - checkpoint1 ---Async -- Test5= ---Open File", - L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s", + L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName = - %s", __FILE__, (UINTN)__LINE__, FileIoEntity->Tpl, @@ -10216,7 +10216,7 @@ BBTestOpenExBasicTestCheckpoint2_Test5_Sync ( FileIoEntity->StatusAsync, FileIoEntity->OpenMode, FileIoEntity->Name - );=20 + ); if (FileIoEntity->OpenMode =3D=3D EFI_FILE_MODE_READ){ DirHandle2->Open ( DirHandle2, 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 index 09b47ee6..1b4a0d34 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestConformance.c @@ -1945,7 +1945,7 @@ BBTestTransmitConformanceTest ( __FILE__, (UINTN)__LINE__, StatusBuf[1] - ); =20 + ); =20 StandardLib->RecordAssertion ( StandardLib, 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 index 4c8f7c58..b50fc63b 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTe= st/UFSDeviceConfigBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTe= st/UFSDeviceConfigBBTestConformance.c @@ -81,7 +81,7 @@ BBTestRwUfsDescriptorConfTest ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 Status =3D UFSDeviceConfig->RwUfsDescriptor(UFSDeviceConfig, TRUE, 0, 0,= 0, &Descriptor, NULL); if (Status =3D=3D EFI_INVALID_PARAMETER)=20 @@ -159,7 +159,7 @@ BBTestRwUfsFlagConfTest ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 Status =3D UFSDeviceConfig->RwUfsFlag(UFSDeviceConfig, TRUE, 1, NULL); if (Status =3D=3D EFI_INVALID_PARAMETER)=20 @@ -237,7 +237,7 @@ BBTestRwUfsAttributeConfTest ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); =20 Status =3D UFSDeviceConfig->RwUfsAttribute(UFSDeviceConfig, TRUE, 0, 0, = 0, &Attribute, NULL); if (Status =3D=3D EFI_INVALID_PARAMETER)=20 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 index e2182c5c..fb966a87 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/Bl= ackBoxTest/VariableServicesBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/Bl= ackBoxTest/VariableServicesBBTestConformance.c @@ -3653,8 +3653,10 @@ HardwareErrorRecordConfTest ( L"RT.SetVariable - Retrive the Hardware Error Record = variables, check the name of them", L"%a:%d:Status - %r, Expected - %r", __FILE__, - (UINTN)__LINE__ - ); =20 + (UINTN)__LINE__, + Status, + EFI_SUCCESS + ); =20 =20 if (AssertionType =3D=3D EFI_TEST_ASSERTION_FAILED) 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 index 634246fc..21cf40f9 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/Bloc= kIo2BBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/Bloc= kIo2BBTestFunction.c @@ -4688,7 +4688,8 @@ BBTestFushBlocksExFunctionAutoTestCheckpoint1( __FILE__, (UINTN)__LINE__, 4, - EFI_SUCCESS + EFI_SUCCESS, + BlockIo2TokenBuffer[IndexI].TransactionStatus ); =20 Status =3D gtBS->SetTimer (TimerEvent, TimerCancel, 0); 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 index 7b0cc6fc..000ad8f2 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTes= t/ComponentName2BBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTes= t/ComponentName2BBTestFunction.c @@ -718,10 +718,10 @@ BBTestGetControllerNameFuncTestCheckpoint2 ( AssertionType, gComponentName2BBTestFunctionAssertionGuid003, L"Please Use Native RFC3066 which is preferable i= n UEFI 2.X\nCOMPONENT_NAME2_PROTOCOL.GetControllerName - GetControllerName(= ) returns EFI_SUCCESS support language", - L"%a:%d: Language - %c%c%c, ControllerIndex - %d,= ChildIndex - %d, ControllerName - %s, Status - %r", - __FILE__, + L"%a:%d: Language - %c%c%c%c, ControllerIndex - %= d, ChildIndex - %d, ControllerName - %s, Status - %r", + __FILE__, (UINTN)__LINE__, - Lang, + Lang[0],Lang[1],Lang[2],Lang[3], Index, ChildIndex, (ControllerName =3D=3D NULL) ? L"(NULL)" : Contro= llerName, 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 index 4b4988ec..3d1c6ffe 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBo= xTest/DriverDiagnostics2BBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBo= xTest/DriverDiagnostics2BBTestFunction.c @@ -660,10 +660,10 @@ BBTestRunDiagnosticsFuncTestCheckpoint2 ( AssertionType, gFunctionAssertionGuid002, 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", - L"%a:%d: Language - %c%c%c, ControllerIndex - %d,= ChildIndex - %d, ControllerName - %s, Status - %r", + L"%a:%d: Language - %c%c%c%c, ControllerIndex - %= d, ChildIndex - %d, ControllerName - %s, Status - %r", __FILE__, (UINTN)__LINE__, - Lang, + Lang[0],Lang[1],Lang[2],Lang[3], Index, ChildIndex, (ControllerName =3D=3D NULL) ? L"(NULL)" : Contro= llerName, 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 index d182ea69..9c3d2bad 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/BlackBoxTes= t/GraphicsOutputBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/BlackBoxTes= t/GraphicsOutputBBTestFunction.c @@ -171,7 +171,7 @@ Returns: AssertionType, gEfiGraphicsOutputQueryModeBBTestFunctionAssertionGui= d, L"EFI_GRAPHICS_OUTPUT_PROTOCOL.QueryMode - SetMode() = then QueryMode(), compare Info structure", - L"%a:%d: Status", + L"%a:%d: Status - %r", (UINTN) __FILE__, (UINTN) (UINTN)__LINE__, Status @@ -752,7 +752,8 @@ Returns: L"%a:%d:Status:%r, Expected:%r", (UINTN) __FILE__, (UINTN) (UINTN)__LINE__, - (UINTN) Status + (UINTN) Status, + EFI_SUCCESS ); return Status; } @@ -1473,7 +1474,8 @@ Returns: L"%a:%d:Status:%r, Expected:%r", (UINTN) __FILE__, (UINTN) (UINTN)__LINE__, - (UINTN) Status + (UINTN) Status, + EFI_SUCCESS ); continue; } 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 index 27994144..51ac332c 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/P= xeBaseCodeBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/P= xeBaseCodeBBTestFunction.c @@ -1252,7 +1252,7 @@ BBTestNewStopFunctionTest ( __FILE__, (UINTN)__LINE__, Status - ); =20 + ); } =20 // 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 index ed0d8743..21629c76 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemBBTestFunction.c @@ -1608,7 +1608,7 @@ BBTestReadOnlyTestCheckPoints ( AssertionType, gReadOnlyFileSystemBBTestAssertionGuid005, L"ReadOnly System: Dir SetInfo should return EFI_WRITE_= PROTECTED", - L"%a:%d: Status - %r", + L"%a:%d: Status1 - %r, Status2 - %r", __FILE__, (UINTN)__LINE__, Status1, 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 index 70ec88f1..aaa34ef9 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemExBBTestFunction_OpenEx.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxT= est/SimpleFileSystemExBBTestFunction_OpenEx.c @@ -1155,7 +1155,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async ( EFI_TEST_ASSERTION_FAILED, gSimpleFileSystemExBBTestFunctionAssertionGuid027, L"OpenEx() Basic Test - checkpoint1 ----Test1----Asyn= c", - L"%a:%d: FileIoEntity->Tpl, Status - %r, File Name - = %", + L"%a:%d: FileIoEntity->Tpl - %d, Status - %r, File Na= me - %", __FILE__, (UINTN)__LINE__, FileIoEntity->Tpl, @@ -2152,7 +2152,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async ( EFI_TEST_ASSERTION_FAILED, gSimpleFileSystemExBBTestFunctionAssertionGuid039, L"OpenEx() Basic Test - checkpoint1 ---Async", - L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s", + L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName = - %s", __FILE__, (UINTN)__LINE__, FileIoEntity->Tpl, @@ -2656,7 +2656,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async ( EFI_TEST_ASSERTION_FAILED, gSimpleFileSystemExBBTestFunctionAssertionGuid043, L"OpenEx() Basic Test - checkpoint1 ---Async -- Test4= ----Open File", - L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s", + L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName = - %s", __FILE__, (UINTN)__LINE__, FileIoEntity->Tpl, @@ -3302,7 +3302,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async ( EFI_TEST_ASSERTION_FAILED, gSimpleFileSystemExBBTestFunctionAssertionGuid047, L"OpenEx() Basic Test - checkpoint1 ---Async -- Test5= ---Open File", - L"%a:%d: FileIoEntity->Tpl,Status - %r,FileName - %s", + L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName = - %s", __FILE__, (UINTN)__LINE__, FileIoEntity->Tpl, @@ -10216,7 +10216,7 @@ BBTestOpenExBasicTestCheckpoint2_Test5_Sync ( FileIoEntity->StatusAsync, FileIoEntity->OpenMode, FileIoEntity->Name - );=20 + ); if (FileIoEntity->OpenMode =3D=3D EFI_FILE_MODE_READ){ DirHandle2->Open ( DirHandle2, 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 index 682076ea..175fe11e 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestConformance.c @@ -1945,7 +1945,7 @@ BBTestTransmitConformanceTest ( __FILE__, (UINTN)__LINE__, StatusBuf[1] - ); =20 + ); =20 StandardLib->RecordAssertion ( StandardLib, --=20 2.28.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#67870): https://edk2.groups.io/g/devel/message/67870 Mute This Topic: https://groups.io/mt/78472376/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-